[Libreoffice-commits] core.git: vcl/win

[Jan Holesovsky]

 vcl/win/source/window/salframe.cxx |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 0a2d7345f756b49440ab7845ac0a1e991f2a014e
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Wed Nov 12 18:49:50 2014 +0100

    windows: Default to large icons, as we do on all other operating systems.
    
    Change-Id: Ifbb7287b5c28de7e23f95b89574ba4196fbb58ac

diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index 3d3b242..dade361 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -2777,13 +2777,9 @@ void WinSalFrame::UpdateSettings( AllSettings& rSettings )
             ImplSalUpdateStyleFontW( hDC, aLogFont, aIconFont );
     }
 
-    // get screen font resolution to calculate toolbox item size
-    long nDPIY = GetDeviceCaps( hDC, LOGPIXELSY );
-
     ReleaseDC( 0, hDC );
 
-    long nHeightPx = aMenuFont.GetHeight() * nDPIY / 72;
-    aStyleSettings.SetToolbarIconSize( (((nHeightPx-1)*2) >= 28) ? STYLE_TOOLBAR_ICONSIZE_LARGE : STYLE_TOOLBAR_ICONSIZE_SMALL );
+    aStyleSettings.SetToolbarIconSize(STYLE_TOOLBAR_ICONSIZE_LARGE);
 
     aStyleSettings.SetMenuFont( aMenuFont );
     aStyleSettings.SetTitleFont( aTitleFont );