From 521c7a5cfba96689c16ab4af2824c49ccebd179c Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Fri, 9 Oct 2015 14:15:08 -0700 Subject: [PATCH] Limit font pixel size to work around OSX El Capitan problem --- src/QmlControls/ScreenTools.qml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/QmlControls/ScreenTools.qml b/src/QmlControls/ScreenTools.qml index c8b5682a1..79a9a71a6 100644 --- a/src/QmlControls/ScreenTools.qml +++ b/src/QmlControls/ScreenTools.qml @@ -12,8 +12,11 @@ Item { readonly property real defaultFontPixelHeight: defaultFontPixelSize readonly property real defaultFontPixelWidth: _textMeasure.fontWidth readonly property real smallFontPixelSize: defaultFontPixelSize * ScreenToolsController.smallFontPixelSizeRatio - readonly property real mediumFontPixelSize: defaultFontPixelSize * ScreenToolsController.mediumFontPixelSizeRatio - readonly property real largeFontPixelSize: defaultFontPixelSize * ScreenToolsController.largeFontPixelSizeRatio + + // On OSX ElCapitan with Qt 5.4.0 any font pixel size above 19 shows garbage test. No idea why at this point. + // Will remove Math.min when problem is figure out. + readonly property real mediumFontPixelSize: Math.min(defaultFontPixelSize * ScreenToolsController.mediumFontPixelSizeRatio, 19) + readonly property real largeFontPixelSize: Math.min(defaultFontPixelSize * ScreenToolsController.largeFontPixelSizeRatio, 19) property bool isAndroid: ScreenToolsController.isAndroid property bool isiOS: ScreenToolsController.isiOS -- 2.22.0