diff options
author | Jan Holesovsky <kendy@suse.cz> | 2010-11-25 14:27:02 +0100 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2010-11-25 14:27:02 +0100 |
commit | f45f864898ffe865752334137215f167ebb448d4 (patch) | |
tree | 718f76ab128bfe2cecc4d6d6c87b54aefbf14ee3 /vcl/aqua | |
parent | 6c1779cedf60353cf4fcb109b71a632d4008720a (diff) | |
parent | afd5ff21ce4e5859a92eef96157e3779c5b30853 (diff) |
Merge remote branch 'origin/libreoffice-3-3'
Diffstat (limited to 'vcl/aqua')
-rw-r--r-- | vcl/aqua/source/window/salframe.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/vcl/aqua/source/window/salframe.cxx b/vcl/aqua/source/window/salframe.cxx index 27573318228c..e280a583b3d5 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 ); |