vcl/source/window/settings.cxx | 9 ---------
1 file changed, 9 deletions(-)
New commits:
commit 606393be5fdbded38d986db60cdba6f0353f22ef
Author: Bernhard Widl <bernhard.w...@cib.de>
Date: Fri Oct 20 14:34:53 2017 +0200
tdf#113444 removed capping of default font size
Change-Id: Ic2ef7eeea7dd9306b57d55952ab716d6255f9576
Reviewed-on: https://gerrit.libreoffice.org/43605
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Jenkins <c...@libreoffice.org>
(cherry picked from commit cb151051d79a7ec176e769a33a56e7d906fc1425)
diff --git a/vcl/source/window/settings.cxx b/vcl/source/window/settings.cxx
index c9a8fd1c7ba0..7a14740bc85e 100644
--- a/vcl/source/window/settings.cxx
+++ b/vcl/source/window/settings.cxx
@@ -152,18 +152,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 kown to be often too small to
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
