vcl/source/window/toolbox.cxx | 6 ++++-- vcl/source/window/toolbox2.cxx | 3 +++ 2 files changed, 7 insertions(+), 2 deletions(-)
New commits: commit 4453ea0f988e861217a5cf94445e8ca8a36fa174 Author: Jan Holesovsky <[email protected]> Date: Thu Jan 17 12:02:08 2013 +0100 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 <[email protected]> Tested-by: Noel Power <[email protected]> diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index 307957f..69585dc 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 2192d39..e598841 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; _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
