diff options
| author | Bernhard Widl <bernhard.widl@cib.de> | 2017-10-20 14:34:53 +0200 |
|---|---|---|
| committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2017-10-26 08:43:10 +0200 |
| commit | cb151051d79a7ec176e769a33a56e7d906fc1425 (patch) | |
| tree | fc6c2890b0cce32924934572569ce10a8ccc418b | |
| parent | 08a690cf66d4e798896b61aa5a7a81e81885cd0c (diff) | |
tdf#113444 removed capping of default font size
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>
| -rw-r--r-- | vcl/source/window/settings.cxx | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/vcl/source/window/settings.cxx b/vcl/source/window/settings.cxx index bb18f957a72a..4234d5327d20 100644 --- a/vcl/source/window/settings.cxx +++ b/vcl/source/window/settings.cxx @@ -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 |