summaryrefslogtreecommitdiff
path: root/vcl/source/window/toolbox.cxx
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@suse.cz>2013-01-17 12:02:08 +0100
committerJan Holesovsky <kendy@suse.cz>2013-01-17 17:11:10 +0100
commitaab4b03f605ff4273aa41bbbc6fdbf3ffae8daee (patch)
treec6e84839bd214e4b7721fcaebbf47afde45fb33b /vcl/source/window/toolbox.cxx
parent301efb8ec61966c93c4445920c5720c0d8d8cae5 (diff)
Personas: Fix fdo#59230 - make Personas fully work in non-NWF case too.
Change-Id: I19a475f198fcb24c4d66134eb67da719fc99099e
Diffstat (limited to 'vcl/source/window/toolbox.cxx')
-rw-r--r--vcl/source/window/toolbox.cxx6
1 files changed, 4 insertions, 2 deletions
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 307957f762b6..69585dc95798 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -565,7 +565,8 @@ void ToolBox::ImplDrawBackground( ToolBox* pThis, const Rectangle &rRect )
if( !bNativeOk )
{
- if( !pThis->IsBackground() )
+ if( !pThis->IsBackground() ||
+ ( pThis->GetAlign() == WINDOWALIGN_TOP && !Application::GetSettings().GetStyleSettings().GetPersonaHeader().IsEmpty() ) )
{
if( !pThis->IsInPaint() )
ImplDrawTransparentBackground( pThis, aPaintRegion );
@@ -1546,7 +1547,8 @@ void ToolBox::ImplInitSettings( sal_Bool bFont,
}
else
{
- if( IsNativeControlSupported( CTRL_TOOLBAR, PART_ENTIRE_CONTROL ) )
+ if( IsNativeControlSupported( CTRL_TOOLBAR, PART_ENTIRE_CONTROL ) ||
+ ( GetAlign() == WINDOWALIGN_TOP && !Application::GetSettings().GetStyleSettings().GetPersonaHeader().IsEmpty() ) )
{
SetBackground();
SetPaintTransparent( sal_True );