Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1740
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/40/1740/1
Personas: Fix fdo#59230 - make Personas fully work in non-NWF case too.
Change-Id: I19a475f198fcb24c4d66134eb67da719fc99099e
---
M vcl/source/window/toolbox.cxx
M vcl/source/window/toolbox2.cxx
2 files changed, 7 insertions(+), 2 deletions(-)
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 @@
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 @@
}
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 @@
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;
--
To view, visit https://gerrit.libreoffice.org/1740
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I19a475f198fcb24c4d66134eb67da719fc99099e
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Jan Holesovsky <ke...@suse.cz>
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
