You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by af...@apache.org on 2013/07/09 11:45:08 UTC
svn commit: r1501169 - in /openoffice/trunk/main:
sfx2/source/sidebar/Theme.cxx svx/source/sidebar/text/TextPropertyPanel.hrc
Author: af
Date: Tue Jul 9 09:45:08 2013
New Revision: 1501169
URL: http://svn.apache.org/r1501169
Log:
122707: Show a frame around toolbars in sidebar panels.
Modified:
openoffice/trunk/main/sfx2/source/sidebar/Theme.cxx
openoffice/trunk/main/svx/source/sidebar/text/TextPropertyPanel.hrc
Modified: openoffice/trunk/main/sfx2/source/sidebar/Theme.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/source/sidebar/Theme.cxx?rev=1501169&r1=1501168&r2=1501169&view=diff
==============================================================================
--- openoffice/trunk/main/sfx2/source/sidebar/Theme.cxx (original)
+++ openoffice/trunk/main/sfx2/source/sidebar/Theme.cxx Tue Jul 9 09:45:08 2013
@@ -424,28 +424,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(
GRADIENT_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)));
Modified: openoffice/trunk/main/svx/source/sidebar/text/TextPropertyPanel.hrc
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/sidebar/text/TextPropertyPanel.hrc?rev=1501169&r1=1501168&r2=1501169&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/sidebar/text/TextPropertyPanel.hrc (original)
+++ openoffice/trunk/main/svx/source/sidebar/text/TextPropertyPanel.hrc Tue Jul 9 09:45:08 2013
@@ -45,7 +45,7 @@
#define X0 SECTIONPAGE_MARGIN_HORIZONTAL
#define X1 SECTIONPAGE_MARGIN_HORIZONTAL + 1 + TOOLBOX_ITEM_WIDTH * 2 + 4
#define X2 (PROPERTYPAGE_WIDTH - (FONTSIZE_WIDTH))
-#define X3 (X2 - (TOOLBOX_ITEM_DD_WIDTH) - 2)
+#define X3 (X2 - (TOOLBOX_ITEM_DD_WIDTH) - 3)
#define FIRST_LINE_Y SECTIONPAGE_MARGIN_VERTICAL_TOP
#define SECOND_LINE_Y FIRST_LINE_Y + CBOX_HEIGHT + CONTROL_SPACING_VERTICAL + 1