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

[Thorsten Behrens]

 vcl/aqua/source/window/salframe.cxx      |    2 ++
 vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |    3 +--
 vcl/unx/kde/salnativewidgets-kde.cxx     |    2 ++
 vcl/unx/kde4/KDESalFrame.cxx             |    2 ++
 4 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 87ae510658ecfa4ebfa08381482ac0ee3f27cb40
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Thu Nov 25 00:25:02 2010 +0100

    Make toolbar icon size native-widget controlled
    
    This improves on the gui-toolbox-large-icons.diff, in that the
    icon size is set to 'auto', and the native widget code decides which
    size to pick. This was chiefly triggered by Mac user complaints, not
    so much liking the large icons there.

diff --git a/vcl/aqua/source/window/salframe.cxx b/vcl/aqua/source/window/salframe.cxx
index eb1ed95..745152f 100644
--- a/vcl/aqua/source/window/salframe.cxx
+++ b/vcl/aqua/source/window/salframe.cxx
@@ -1170,6 +1170,8 @@ void AquaSalFrame::UpdateSettings( AllSettings& rSettings )
     getResolution( nDPIX, nDPIY );
     aAppFont = getFont( [NSFont systemFontOfSize: 0], nDPIY, aAppFont );
 
+    aStyleSettings.SetToolbarIconSize( nDPIY > 160 ? STYLE_TOOLBAR_ICONSIZE_LARGE : STYLE_TOOLBAR_ICONSIZE_SMALL );
+
     // TODO: better mapping of aqua<->ooo font settings
     aStyleSettings.SetAppFont( aAppFont );
     aStyleSettings.SetHelpFont( aAppFont );
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index 13e3852..0dcaf0c 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -3581,8 +3581,7 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings )
     aStyleSet.SetPreferredSymbolsStyleName( OUString::createFromAscii( pIconThemeName ) );
     g_free( pIconThemeName );
 
-    //  FIXME: need some way of fetching toolbar icon size.
-//	aStyleSet.SetToolbarIconSize( STYLE_TOOLBAR_ICONSIZE_SMALL );
+	aStyleSet.SetToolbarIconSize( STYLE_TOOLBAR_ICONSIZE_LARGE );
 
     const cairo_font_options_t* pNewOptions = NULL;
     if( GdkScreen* pScreen = gdk_display_get_screen( gdk_display_get_default(), m_nScreen ) )
diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx
index 3f964f3..c15e617 100644
--- a/vcl/unx/kde/salnativewidgets-kde.cxx
+++ b/vcl/unx/kde/salnativewidgets-kde.cxx
@@ -1831,6 +1831,8 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
     StyleSettings aStyleSettings( rSettings.GetStyleSettings() );
     bool bSetTitleFont = false;
 
+    aStyleSettings.SetToolbarIconSize( STYLE_TOOLBAR_ICONSIZE_LARGE );
+
     // WM settings
     KConfig *pConfig = KGlobal::config();
     if ( pConfig )
diff --git a/vcl/unx/kde4/KDESalFrame.cxx b/vcl/unx/kde4/KDESalFrame.cxx
index c891c93..80adaa9 100644
--- a/vcl/unx/kde4/KDESalFrame.cxx
+++ b/vcl/unx/kde4/KDESalFrame.cxx
@@ -185,6 +185,8 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
     // General settings
     QPalette pal = kapp->palette();
     
+    style.SetToolbarIconSize( STYLE_TOOLBAR_ICONSIZE_LARGE );
+
     style.SetActiveColor(toColor(pal.color(QPalette::Active, QPalette::Window)));
     style.SetDeactiveColor(toColor(pal.color(QPalette::Inactive, QPalette::Window)));