paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-12-08 05:57:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Qt5: fixed initialization of font in InitStockFont(). issue #34625

Browse Source 
git-svn-id: trunk@59709 -
This commit is contained in:
zeljko 2018-12-01 16:39:58 +00:00
parent 5db60e1bdd
commit 91faa27f7b
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/qt5/qtwinapi.inc
View File

@ -4810,10 +4810,18 @@ begin
QtFont := QWidget_font(AMenu); QtFont := QWidget_font(AMenu);
QFont_family(QtFont, @AName); QFont_family(QtFont, @AName);
Font.Name := UTF16ToUTF8(AName); Font.Name := UTF16ToUTF8(AName);
{$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 if QFont_pointSize(QtFont) > 0 then
Font.Size := QFont_pointSize(QtFont) Font.Size := QFont_pointSize(QtFont)
else else
Font.Height := QFont_pixelSize(QtFont); Font.Height := QFont_pixelSize(QtFont);
{$endif}
if QFont_bold(QtFont) then if QFont_bold(QtFont) then
Font.Style := Font.Style + [fsBold]; Font.Style := Font.Style + [fsBold];
if QFont_italic(QtFont) then if QFont_italic(QtFont) then
@ -4837,10 +4845,18 @@ begin
QApplication_font(QtFont); QApplication_font(QtFont);
QFont_family(QtFont, @AName); QFont_family(QtFont, @AName);
Font.Name := UTF16ToUTF8(AName); Font.Name := UTF16ToUTF8(AName);
{$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 if QFont_pointSize(QtFont) > 0 then
Font.Size := QFont_pointSize(QtFont) Font.Size := QFont_pointSize(QtFont)
else else
Font.Height := QFont_pixelSize(QtFont); Font.Height := QFont_pixelSize(QtFont);
{$endif}
if QFont_bold(QtFont) then if QFont_bold(QtFont) then
Font.Style := Font.Style + [fsBold]; Font.Style := Font.Style + [fsBold];
if QFont_italic(QtFont) then if QFont_italic(QtFont) then