paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-15 23:59:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Qt: fixed InitStockFont(). issue #34625

Browse Source 
git-svn-id: trunk@59711 -
This commit is contained in:
zeljko 2018-12-01 17:50:09 +00:00
parent a8790dd007
commit 167afa6433
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lcl/interfaces/qt/qtwinapi.inc
View File

@ -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