[Libreoffice-commits] core.git: Branch 'feature/sidebar' - sfx2/source

[Andre Fischer]

 sfx2/source/sidebar/Theme.cxx |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 0a9249f1e00a2792707e31976a7d45ae05240cef
Author: Andre Fischer <af at apache.org>
Date:   Fri Apr 26 06:45:40 2013 +0000

    Related: #i122144# Use same color for all sidebar backgrounds
    
    (cherry picked from commit ae86d3036171e63bfe193e678c9c05a1ec1a12bb)
    
    Change-Id: I4879d515f45f74b25e0319d3244c5722a449c7ed

diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx
index d571885..b7ef8b5 100644
--- a/sfx2/source/sidebar/Theme.cxx
+++ b/sfx2/source/sidebar/Theme.cxx
@@ -212,7 +212,9 @@ void Theme::UpdateTheme (void)
 
 #define Alternatives(n,hc,sys) (mbIsHighContrastMode ? hc : (bUseSystemColors ? sys : n))
 
-        const Color aBaseBackgroundColor (rStyle.GetDialogColor());
+        Color aBaseBackgroundColor (rStyle.GetDialogColor());
+        // UX says this should be a little brighter, but that looks off when compared to the other windows.
+        //aBaseBackgroundColor.IncreaseLuminance(7);
         Color aBorderColor (aBaseBackgroundColor);
         aBorderColor.DecreaseLuminance(15);
         Color aSecondColor (aBaseBackgroundColor);
@@ -220,7 +222,7 @@ void Theme::UpdateTheme (void)
 
         setPropertyValue(
             maPropertyIdToNameMap[Paint_DeckBackground],
-            Any(sal_Int32(rStyle.GetMenuColor().GetRGBColor())));
+            Any(sal_Int32(aBaseBackgroundColor.GetRGBColor())));
 
         setPropertyValue(
             maPropertyIdToNameMap[Paint_DeckTitleBarBackground],
@@ -257,9 +259,7 @@ void Theme::UpdateTheme (void)
                         rStyle.GetFloatTitleHeight()))));
         setPropertyValue(
             maPropertyIdToNameMap[Paint_PanelBackground],
-            Any(sal_Int32(rStyle.GetDialogColor().GetRGBColor())));
-        //            Any(sal_Int32(mbIsHighContrastMode ? 0x000000 :
-        //            0xffffff)));
+            Any(sal_Int32(aBaseBackgroundColor.GetRGBColor())));
 
         setPropertyValue(
             maPropertyIdToNameMap[Paint_PanelTitleBarBackground],