[Libreoffice-commits] core.git: sfx2/source

[Andre Fischer]

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

New commits:
commit f4c9a29d62a6572a0932d5c8e014b7c960131217
Author: Andre Fischer <af at apache.org>
Date:   Tue Jul 9 09:45:08 2013 +0000

    Resolves: #122707# Show a frame around toolbars in sidebar panels.
    
    (cherry picked from commit f6159d52f0423808eaddc9b5f3906cfc3e6baa0b)
    
    Conflicts:
    	sfx2/source/sidebar/Theme.cxx
    	svx/source/sidebar/text/TextPropertyPanel.hrc
    
    Change-Id: I0163d3766923a5a333214f09db4837435590d753

diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx
index 5bad8dc..abc4315 100644
--- a/sfx2/source/sidebar/Theme.cxx
+++ b/sfx2/source/sidebar/Theme.cxx
@@ -399,28 +399,32 @@ void Theme::UpdateTheme (void)
         */
 
         // Gradient style
+        Color aGradientStop2 (aBaseBackgroundColor);
+        aGradientStop2.IncreaseLuminance(17);
+        Color aToolBoxBorderColor (aBaseBackgroundColor);
+        aToolBoxBorderColor.DecreaseLuminance(12);
         setPropertyValue(
             maPropertyIdToNameMap[Paint_ToolBoxBackground],
             Any(Tools::VclToAwtGradient(Gradient(
                         GradientStyle_LINEAR,
-                        Color(0xf2f2f2),
-                        Color(0xfefefe)
+                        aBaseBackgroundColor.GetRGBColor(),
+                        aGradientStop2.GetRGBColor()
                         ))));
         setPropertyValue(
             maPropertyIdToNameMap[Paint_ToolBoxBorderTopLeft],
             mbIsHighContrastMode
                 ? Any(util::Color(sal_uInt32(0x00ff00)))
-                : Any(util::Color(sal_uInt32(0xf2f2f2))));
+                : Any(util::Color(aToolBoxBorderColor.GetRGBColor())));
         setPropertyValue(
             maPropertyIdToNameMap[Paint_ToolBoxBorderCenterCorners],
             mbIsHighContrastMode
                 ? Any(util::Color(sal_uInt32(0x00ff00)))
-                : Any(util::Color(sal_uInt32(0xf2f2f2))));
+                : Any(util::Color(aToolBoxBorderColor.GetRGBColor())));
         setPropertyValue(
             maPropertyIdToNameMap[Paint_ToolBoxBorderBottomRight],
             mbIsHighContrastMode
                 ? Any(util::Color(sal_uInt32(0x00ff00)))
-                : Any(util::Color(sal_uInt32(0xf2f2f2))));
+                : Any(util::Color(aToolBoxBorderColor.GetRGBColor())));
         setPropertyValue(
             maPropertyIdToNameMap[Rect_ToolBoxPadding],
             Any(awt::Rectangle(2,2,2,2)));