commit af4b1dbc934feeaf32eaebfaf331f4264b05e4ee
author Andre Fischer <af@apache.org> Fri Apr 26 06:45:40 2013 +0000
committer Michael Meeks <michael.meeks@suse.com> Mon May 20 11:33:23 2013 +0100
tree 8c05d24e2e2f7cb6c546915e7d62b97e09ec043f
parent 4a2b3f15b334b8c33826305218b8ec872522ad1d

Related: #i122144# Use same color for all sidebar backgrounds

(cherry picked from commit ae86d3036171e63bfe193e678c9c05a1ec1a12bb)

Change-Id: I4879d515f45f74b25e0319d3244c5722a449c7ed

sfx2/source/sidebar/Theme.cxx

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],