diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2013-01-17 12:02:08 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2013-01-17 17:11:10 +0100 |
| commit | aab4b03f605ff4273aa41bbbc6fdbf3ffae8daee (patch) | |
| tree | c6e84839bd214e4b7721fcaebbf47afde45fb33b | |
| parent | 301efb8ec61966c93c4445920c5720c0d8d8cae5 (diff) | |
Personas: Fix fdo#59230 - make Personas fully work in non-NWF case too.
Change-Id: I19a475f198fcb24c4d66134eb67da719fc99099e
| -rw-r--r-- | vcl/source/window/toolbox.cxx | 6 | ||||
| -rw-r--r-- | vcl/source/window/toolbox2.cxx | 3 |
2 files changed, 7 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 ); diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index b9a9853f3a33..19399da16f22 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -936,6 +936,9 @@ void ToolBox::SetAlign( WindowAlign eNewAlign ) else mbHorz = sal_True; + // Update the background according to Persona if necessary + ImplInitSettings( sal_False, sal_False, sal_True ); + // Hier alles neu ausgeben, da sich Border auch aendert mbCalc = sal_True; mbFormat = sal_True; |