diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2013-01-17 12:02:08 +0100 |
|---|---|---|
| committer | Noel Power <noel.power@suse.com> | 2013-01-17 17:03:28 +0000 |
| commit | 4453ea0f988e861217a5cf94445e8ca8a36fa174 (patch) | |
| tree | 1abb8ff4f951e4f82b3a5d6a5652af869ef84ff6 | |
| parent | 718802ca9c5fc01c34e1e4f4ee57ffae0ea30b7b (diff) | |
Personas: Fix fdo#59230 - make Personas fully work in non-NWF case too.
Change-Id: I19a475f198fcb24c4d66134eb67da719fc99099e
Reviewed-on: https://gerrit.libreoffice.org/1740
Reviewed-by: Noel Power <noel.power@suse.com>
Tested-by: Noel Power <noel.power@suse.com>
| -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 2192d39fee27..e59884187ea2 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; |