mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#113444 removed capping of default font size

Browse Source 
Change-Id: Ic2ef7eeea7dd9306b57d55952ab716d6255f9576
Reviewed-on: https://gerrit.libreoffice.org/43605
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Jenkins <ci@libreoffice.org>
This commit is contained in:
Bernhard Widl
2017-10-20 14:34:53 +02:00
committed by Samuel Mehrbrodt
parent 08a690cf66
commit cb151051d7
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
vcl/source/window/settings.cxx
View File

@@ -153,18 +153,9 @@ void Window::ImplUpdateGlobalSettings( AllSettings& rSettings, bool bCallHdl )
ImplGetFrame()->UpdateSettings( rSettings );
StyleSettings aStyleSettings = rSettings.GetStyleSettings();
// #97047: Force all fonts except Menu and Help to a fixed height
// to avoid UI scaling due to large fonts
// - but allow bigger fonts on bigger screens (i16682, i21238)
// dialogs were designed to fit 800x600 with an 8pt font, so scale accordingly
int maxFontheight = 9; // #107886#: 9 is default for some asian systems, so always allow if requested
if( GetDesktopRectPixel().getHeight() > 600 )
maxFontheight = (int) ((( 8.0 * (double) GetDesktopRectPixel().getHeight()) / 600.0) + 1.5);
vcl::Font aFont = aStyleSettings.GetMenuFont();
int defFontheight = aFont.GetFontHeight();
if( defFontheight > maxFontheight )
defFontheight = maxFontheight;
// if the UI is korean, chinese or another locale
// where the system font size is known to be often too small to