paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-10-01 05:29:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Qt6: fixed calculating font height. issue #41026, issue #40960.

Browse Source
This commit is contained in:
zeljan1 2025-01-08 16:23:06 +01:00
parent 759c61f5e1
commit 832b61143a
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lcl/interfaces/qt6/qtwinapi.inc
View File

@ -3112,7 +3112,6 @@ var
ALogBrush: PLogBrush absolute Buf; ALogBrush: PLogBrush absolute Buf;
Dashes: TQRealArray; Dashes: TQRealArray;
i: integer; i: integer;
PaintDevice: QPaintDeviceH;
{$ifdef VerboseQtWinAPI} {$ifdef VerboseQtWinAPI}
ObjType: string; ObjType: string;
{$endif} {$endif}
@ -3149,13 +3148,8 @@ begin
FillChar(ALogFont^, SizeOf(ALogFont^), 0); FillChar(ALogFont^, SizeOf(ALogFont^), 0);
if AFont.getPixelSize = -1 then if AFont.getPixelSize = -1 then
begin ALogFont^.lfHeight := MulDiv(AFont.getPointSize, Screen.PixelsPerInch, 72)
PaintDevice := nil; // QWidget_to_QPaintDevice(QApplication_desktop); else
if PaintDevice <> nil then
ALogFont^.lfHeight := MulDiv(AFont.getPointSize, QPaintDevice_logicalDpiX(PaintDevice), 72)
else
ALogFont^.lfHeight := AFont.getPointSize;
end else
ALogFont^.lfHeight := AFont.getPixelSize; ALogFont^.lfHeight := AFont.getPixelSize;
ALogFont^.lfEscapement := AFont.Angle; ALogFont^.lfEscapement := AFont.Angle;
ALogFont^.lfWeight := ConvertFontWeightToQtConst(AFont.getWeight); ALogFont^.lfWeight := ConvertFontWeightToQtConst(AFont.getWeight);