From 167afa6433d55aaaca3f55a1477d4d161e4d496c Mon Sep 17 00:00:00 2001 From: zeljko Date: Sat, 1 Dec 2018 17:50:09 +0000 Subject: [PATCH] Qt: fixed InitStockFont(). issue #34625 git-svn-id: trunk@59711 - --- lcl/interfaces/qt/qtwinapi.inc | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/lcl/interfaces/qt/qtwinapi.inc b/lcl/interfaces/qt/qtwinapi.inc index 0aa7cfc16c..2ff7230704 100644 --- a/lcl/interfaces/qt/qtwinapi.inc +++ b/lcl/interfaces/qt/qtwinapi.inc @@ -4863,10 +4863,18 @@ begin QtFont := QWidget_font(AMenu); QFont_family(QtFont, @AName); Font.Name := AName{%H-}; + {$ifdef darwin} + // issue #34625 + if QFont_pointSize(QtFont) > 0 then + Font.Height := -Round(QFont_pointSizeF(QtFont)) + else + Font.Height := QFont_pixelSize(QtFont); + {$else} if QFont_pointSize(QtFont) > 0 then Font.Size := QFont_pointSize(QtFont) else Font.Height := QFont_pixelSize(QtFont); + {$endif} if QFont_bold(QtFont) then Font.Style := Font.Style + [fsBold]; if QFont_italic(QtFont) then @@ -4890,10 +4898,18 @@ begin QApplication_font(QtFont); QFont_family(QtFont, @AName); Font.Name := AName{%H-}; + {$ifdef darwin} + // issue #34625 + if QFont_pointSize(QtFont) > 0 then + Font.Height := -Round(QFont_pointSizeF(QtFont)) + else + Font.Height := QFont_pixelSize(QtFont); + {$else} if QFont_pointSize(QtFont) > 0 then Font.Size := QFont_pointSize(QtFont) else Font.Height := QFont_pixelSize(QtFont); + {$endif} if QFont_bold(QtFont) then Font.Style := Font.Style + [fsBold]; if QFont_italic(QtFont) then