[Libreoffice-commits] core.git: 3 commits - officecfg/registry svtools/source vcl/source vcl/win

[Jan Holesovsky]

 officecfg/registry/schema/org/openoffice/Office/Writer.xcs |    2 -
 svtools/source/control/ruler.cxx                           |   14 +++++++++++++
 vcl/source/app/settings.cxx                                |    2 -
 vcl/win/source/gdi/salnativewidgets-luna.cxx               |    4 +--
 4 files changed, 18 insertions(+), 4 deletions(-)

New commits:
commit 6170c7556285b0594994d23bff36328206e7d39a
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Wed Dec 3 11:18:32 2014 +0100

    rulers: Let's hide them by default.
    
    2 years ago this was a hot topic on UX-advise :-) - let's see if people are
    more happy with hiding them by default now.
    
    Change-Id: If4946538232c7579f7ce03d4947360645fb4967d

diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
index 74cfbd6..5d28555 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
@@ -1288,7 +1288,7 @@
             <desc>Specifies whether rulers are displayed. Filters the values of HorizontalRuler and VerticalRuler.</desc>
             <label>Show rulers</label>
           </info>
-          <value>true</value>
+          <value>false</value>
         </prop>
         <prop oor:name="HorizontalRuler" oor:type="xs:boolean" oor:nillable="false">
           <!-- OldPath: Writer/Layout/Window -->
commit 9f3ce795c2ecf5f8ca41b9b4bd24f001fcad59aa
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Wed Dec 3 11:07:18 2014 +0100

    rulers: Make the numbers a bit smaller, and always with odd size.
    
    Change-Id: Id27bb0435d00f2026ff8c82ed246ca67947e9e42

diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index b49421c..1656813 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -991,6 +991,15 @@ void Ruler::ImplDrawTabs( long nMin, long nMax, long nVirTop, long nVirBottom )
     }
 }
 
+static int adjustSize(int nOrig)
+{
+    if (nOrig <= 0)
+        return 0;
+
+    // make sure we return an odd number, that looks better in the ruler
+    return ( (3*nOrig) / 8) * 2 + 1;
+}
+
 void Ruler::ImplInitSettings( bool bFont, bool bForeground, bool bBackground )
 {
     const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
@@ -999,6 +1008,11 @@ void Ruler::ImplInitSettings( bool bFont, bool bForeground, bool bBackground )
     {
         vcl::Font aFont;
         aFont = rStyleSettings.GetToolFont();
+
+        // make the font a bit smaller than default
+        Size aSize(adjustSize(aFont.GetSize().Width()), adjustSize(aFont.GetSize().Height()));
+        aFont.SetSize(aSize);
+
         if ( IsControlFont() )
             aFont.Merge( GetControlFont() );
         SetZoomedPointFont( aFont );
commit dacbe43846a729ef9f46138321c1facb5151c17d
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Wed Dec 3 10:44:02 2014 +0100

    Make the default (non-native) workspace lighter, especially on Windows.
    
    Change-Id: Ie1cc5817a5b75f129791da450105ffee07438900

diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 8048875..648f030 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -715,7 +715,7 @@ void ImplStyleData::SetStandardStyles()
     maWindowTextColor           = Color( COL_BLACK );
     maDialogColor               = Color( COL_LIGHTGRAY );
     maDialogTextColor           = Color( COL_BLACK );
-    maWorkspaceColor            = Color( 0xCF, 0xCF, 0xCF );
+    maWorkspaceColor            = Color( 0xF0, 0xF0, 0xF0 );
     maMonoColor                 = Color( COL_BLACK );
     maFieldColor                = Color( COL_WHITE );
     maFieldTextColor            = Color( COL_BLACK );
diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx b/vcl/win/source/gdi/salnativewidgets-luna.cxx
index 539af04..401e0678 100644
--- a/vcl/win/source/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx
@@ -474,7 +474,7 @@ static void impl_drawAeroToolbar( HDC hDC, RECT rc, bool bHorizontal )
         GradientFill( hDC, vert, 2, g_rect, 1, GRADIENT_FILL_RECT_V );
 
         // and a darker horizontal line under that
-        HPEN hpen = CreatePen( PS_SOLID, 1, RGB( 0xa0, 0xa0, 0xa0 ) );
+        HPEN hpen = CreatePen( PS_SOLID, 1, RGB( 0xb0, 0xb0, 0xb0 ) );
         SelectObject( hDC, hpen );
 
         MoveToEx( hDC, rc.left, gradient_bottom, NULL );
@@ -499,7 +499,7 @@ static void impl_drawAeroToolbar( HDC hDC, RECT rc, bool bHorizontal )
             to_x = rc.right;
             from_y = to_y = rc.top;
 
-            HPEN hpen = CreatePen( PS_SOLID, 1, RGB( 0xa0, 0xa0, 0xa0 ) );
+            HPEN hpen = CreatePen( PS_SOLID, 1, RGB( 0xb0, 0xb0, 0xb0 ) );
             SelectObject( hDC, hpen );
 
             MoveToEx( hDC, from_x, from_y, NULL );