Kaydet (Commit) fe4412c8 authored tarafından Bryan Quigley's avatar Bryan Quigley Kaydeden (comit) Samuel Mehrbrodt

Unused code removal DrawGradientWallpaper

Doesn't appear needed on Linux and tests have shown it isn't
needed on Windows or Mac either.

Change-Id: Iaaba6dcc4783557a4165d635b57a256402b0b4d2
Reviewed-on: https://gerrit.libreoffice.org/19259Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
üst 78cf4ca4
...@@ -999,9 +999,6 @@ public: ...@@ -999,9 +999,6 @@ public:
virtual void Erase(); virtual void Erase();
virtual void Erase( const Rectangle& rRect ) { DrawWallpaper( rRect, GetBackground() ); } virtual void Erase( const Rectangle& rRect ) { DrawWallpaper( rRect, GetBackground() ); }
protected:
virtual void DrawGradientWallpaper( long nX, long nY, long nWidth, long nHeight, const Wallpaper& rWallpaper );
private: private:
SAL_DLLPRIVATE void DrawWallpaper( long nX, long nY, long nWidth, long nHeight, const Wallpaper& rWallpaper ); SAL_DLLPRIVATE void DrawWallpaper( long nX, long nY, long nWidth, long nHeight, const Wallpaper& rWallpaper );
SAL_DLLPRIVATE void DrawColorWallpaper( long nX, long nY, long nWidth, long nHeight, const Wallpaper& rWallpaper ); SAL_DLLPRIVATE void DrawColorWallpaper( long nX, long nY, long nWidth, long nHeight, const Wallpaper& rWallpaper );
......
...@@ -812,12 +812,6 @@ protected: ...@@ -812,12 +812,6 @@ protected:
virtual void ClipToPaintRegion( Rectangle& rDstRect ) override; virtual void ClipToPaintRegion( Rectangle& rDstRect ) override;
virtual bool UsePolyPolygonForComplexGradient() override; virtual bool UsePolyPolygonForComplexGradient() override;
virtual void DrawGradientWallpaper(long nX, long nY, long nWidth, long nHeight,
const Wallpaper& rWallpaper) override
{
OutputDevice::DrawGradientWallpaper(nX, nY, nWidth, nHeight, rWallpaper);
}
virtual void ApplySettings(vcl::RenderContext& rRenderContext); virtual void ApplySettings(vcl::RenderContext& rRenderContext);
public: public:
bool HasMirroredGraphics() const override; bool HasMirroredGraphics() const override;
......
...@@ -60,8 +60,6 @@ void OutputDevice::DrawWallpaper( long nX, long nY, ...@@ -60,8 +60,6 @@ void OutputDevice::DrawWallpaper( long nX, long nY,
if( rWallpaper.IsBitmap() ) if( rWallpaper.IsBitmap() )
DrawBitmapWallpaper( nX, nY, nWidth, nHeight, rWallpaper ); DrawBitmapWallpaper( nX, nY, nWidth, nHeight, rWallpaper );
else if( rWallpaper.IsGradient() )
DrawGradientWallpaper( nX, nY, nWidth, nHeight, rWallpaper );
else else
DrawColorWallpaper( nX, nY, nWidth, nHeight, rWallpaper ); DrawColorWallpaper( nX, nY, nWidth, nHeight, rWallpaper );
} }
...@@ -119,7 +117,6 @@ void OutputDevice::DrawBitmapWallpaper( long nX, long nY, ...@@ -119,7 +117,6 @@ void OutputDevice::DrawBitmapWallpaper( long nX, long nY,
const WallpaperStyle eStyle = rWallpaper.GetStyle(); const WallpaperStyle eStyle = rWallpaper.GetStyle();
const bool bOldMap = mbMap; const bool bOldMap = mbMap;
bool bDrawn = false; bool bDrawn = false;
bool bDrawGradientBackground = false;
bool bDrawColorBackground = false; bool bDrawColorBackground = false;
if( pCached ) if( pCached )
...@@ -134,34 +131,24 @@ void OutputDevice::DrawBitmapWallpaper( long nX, long nY, ...@@ -134,34 +131,24 @@ void OutputDevice::DrawBitmapWallpaper( long nX, long nY,
// draw background // draw background
if( bTransparent ) if( bTransparent )
{ {
if( rWallpaper.IsGradient() ) if( !pCached && !rWallpaper.GetColor().GetTransparency() )
bDrawGradientBackground = true;
else
{ {
if( !pCached && !rWallpaper.GetColor().GetTransparency() ) ScopedVclPtrInstance< VirtualDevice > aVDev( *this );
{ aVDev->SetBackground( rWallpaper.GetColor() );
ScopedVclPtrInstance< VirtualDevice > aVDev( *this ); aVDev->SetOutputSizePixel( Size( nBmpWidth, nBmpHeight ) );
aVDev->SetBackground( rWallpaper.GetColor() ); aVDev->DrawBitmapEx( Point(), aBmpEx );
aVDev->SetOutputSizePixel( Size( nBmpWidth, nBmpHeight ) ); aBmpEx = aVDev->GetBitmap( Point(), aVDev->GetOutputSizePixel() );
aVDev->DrawBitmapEx( Point(), aBmpEx );
aBmpEx = aVDev->GetBitmap( Point(), aVDev->GetOutputSizePixel() );
}
bDrawColorBackground = true;
} }
bDrawColorBackground = true;
} }
else if( eStyle != WallpaperStyle::Tile && eStyle != WallpaperStyle::Scale ) else if( eStyle != WallpaperStyle::Tile && eStyle != WallpaperStyle::Scale )
{ {
if( rWallpaper.IsGradient() ) bDrawColorBackground = true;
bDrawGradientBackground = true;
else
bDrawColorBackground = true;
} }
// background of bitmap? // background of bitmap?
if( bDrawGradientBackground ) if( bDrawColorBackground && bTransparent )
DrawGradientWallpaper( nX, nY, nWidth, nHeight, rWallpaper );
else if( bDrawColorBackground && bTransparent )
{ {
DrawColorWallpaper( nX, nY, nWidth, nHeight, rWallpaper ); DrawColorWallpaper( nX, nY, nWidth, nHeight, rWallpaper );
bDrawColorBackground = false; bDrawColorBackground = false;
...@@ -343,28 +330,4 @@ void OutputDevice::DrawBitmapWallpaper( long nX, long nY, ...@@ -343,28 +330,4 @@ void OutputDevice::DrawBitmapWallpaper( long nX, long nY,
mpMetaFile = pOldMetaFile; mpMetaFile = pOldMetaFile;
} }
void OutputDevice::DrawGradientWallpaper( long nX, long nY,
long nWidth, long nHeight,
const Wallpaper& rWallpaper )
{
assert(!is_double_buffered_window());
Rectangle aBound;
GDIMetaFile* pOldMetaFile = mpMetaFile;
const bool bOldMap = mbMap;
aBound = Rectangle( Point( nX, nY ), Size( nWidth, nHeight ) );
mpMetaFile = NULL;
EnableMapMode( false );
Push( PushFlags::CLIPREGION );
IntersectClipRegion( Rectangle( Point( nX, nY ), Size( nWidth, nHeight ) ) );
DrawGradient( aBound, rWallpaper.GetGradient() );
Pop();
EnableMapMode( bOldMap );
mpMetaFile = pOldMetaFile;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment