diff options
| author | Andre Fischer <af@apache.org> | 2013-07-09 09:45:08 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-07-09 14:55:37 +0100 |
| commit | f4c9a29d62a6572a0932d5c8e014b7c960131217 (patch) | |
| tree | 746199d47a2c57ac63a6f4a70ce8f6f3d9e391ce /sfx2 | |
| parent | 4935422b410757bb4920b98a2d81da3c11b8e3d7 (diff) | |
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
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/sidebar/Theme.cxx | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx index 5bad8dcc80a2..abc4315d3760 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))); |