[Libreoffice-commits] .: Branch 'libreoffice-3-6' - vcl/source vcl/unx

[Jan Holesovsky]

 vcl/source/app/settings.cxx              |    2 ++
 vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |    1 +
 2 files changed, 3 insertions(+)

New commits:
commit 38fd6c8498b18121413228a676e0cf7653c299fe
Author: Ruslan Kabatsayev <b7.10110111 at gmail.com>
Date:   Tue Jul 17 18:18:35 2012 +0400

    Make default dark shadow non-black
    
    Change-Id: If517926b12633a96ad8088e007cfcd6d84e5c919
    Signed-off-by: Jan Holesovsky <kendy at suse.cz>

diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 02457d1..dfdfa95 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -474,8 +474,10 @@ void StyleSettings::Set3DColors( const Color& rColor )
     {
         mpData->maLightColor    = rColor;
         mpData->maShadowColor   = rColor;
+        mpData->maDarkShadowColor=rColor;
         mpData->maLightColor.IncreaseLuminance( 64 );
         mpData->maShadowColor.DecreaseLuminance( 64 );
+        mpData->maDarkShadowColor.DecreaseLuminance( 100 );
         sal_uLong   nRed    = mpData->maLightColor.GetRed();
         sal_uLong   nGreen  = mpData->maLightColor.GetGreen();
         sal_uLong   nBlue   = mpData->maLightColor.GetBlue();
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index e1c8e2d..4acf112 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -3730,6 +3730,7 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings )
     std::fprintf( stderr, "MenuBarTextColor = %x (%d)\n", (int)aStyleSet.GetMenuBarTextColor().GetColor(), aStyleSet.GetMenuBarTextColor().GetLuminance() );
     std::fprintf( stderr, "LightColor = %x (%d)\n", (int)aStyleSet.GetLightColor().GetColor(), aStyleSet.GetLightColor().GetLuminance() );
     std::fprintf( stderr, "ShadowColor = %x (%d)\n", (int)aStyleSet.GetShadowColor().GetColor(), aStyleSet.GetShadowColor().GetLuminance() );
+    std::fprintf( stderr, "DarkShadowColor = %x (%d)\n", (int)aStyleSet.GetDarkShadowColor().GetColor(), aStyleSet.GetDarkShadowColor().GetLuminance() );
 #endif
 
     // Awful hack for menu separators in the Sonar and similar themes.