summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@suse.cz>2013-01-17 16:40:24 +0100
committerJan Holesovsky <kendy@suse.cz>2013-03-04 17:49:31 +0100
commit085f830c49d61f3eec433280ec465033eaa7babf (patch)
tree99ff38effea02733bda0dcef2297bd0d93b5fd3e
parent5579810492ce0a171d3a180a7158e6ae317cbc64 (diff)
Personas: Fix fdo#59208 - get rid of artifacts when we run out of bitmap.
So far I am using the same color that is used for the workspace; should it be a problem, we can use a different color. Change-Id: I06fde7f31a9d37d2e387a7e3fd0b6d3d33f8d6e6
-rw-r--r--vcl/source/window/dockingarea.cxx1
-rw-r--r--vcl/source/window/menu.cxx2
2 files changed, 3 insertions, 0 deletions
diff --git a/vcl/source/window/dockingarea.cxx b/vcl/source/window/dockingarea.cxx
index 33b1c22da6af..5c744a2cd445 100644
--- a/vcl/source/window/dockingarea.cxx
+++ b/vcl/source/window/dockingarea.cxx
@@ -64,6 +64,7 @@ static void ImplInitBackground( DockingAreaWindow* pThis )
{
Wallpaper aWallpaper( rPersonaBitmap );
aWallpaper.SetStyle( WALLPAPER_TOPRIGHT );
+ aWallpaper.SetColor( Application::GetSettings().GetStyleSettings().GetWorkspaceColor() );
// we need to shift the bitmap vertically so that it spans over the
// menubar conveniently
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 66de4bfcc193..e379523c76a3 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -3870,6 +3870,8 @@ static void ImplInitMenuWindow( Window* pWin, sal_Bool bFont, sal_Bool bMenuBar
{
Wallpaper aWallpaper( rPersonaBitmap );
aWallpaper.SetStyle( WALLPAPER_TOPRIGHT );
+ aWallpaper.SetColor( Application::GetSettings().GetStyleSettings().GetWorkspaceColor() );
+
pWin->SetBackground( aWallpaper );
pWin->SetPaintTransparent( sal_False );
pWin->SetParentClipMode( 0 );