paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-16 18:49:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Qt5: code simplified. Patch by Alexey Torgashin

Browse Source
This commit is contained in:
Željan Rikalo 2022-11-11 20:34:02 +01:00
parent e5b2a64d68
commit 32e5d2b8ae
2 changed files with 20 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lcl/interfaces/qt5/qtint.pp
View File

@ -478,6 +478,23 @@ begin
until Result <> nil; until Result <> nil;
end; end;
function ConvertFontWeightToQtConst(Value: Integer): Integer;
begin
case Value of
0: Result := FW_THIN;
12: Result := FW_EXTRALIGHT;
25: Result := FW_LIGHT;
50: Result := FW_NORMAL;
57: Result := FW_MEDIUM;
63: Result := FW_SEMIBOLD;
75: Result := FW_BOLD;
81: Result := FW_EXTRABOLD;
87: Result := FW_HEAVY;
else
Result := Round(Value * 9.5);
end;
end;
{------------------------------------------------------------------------------ {------------------------------------------------------------------------------
Method: GetQtVersion Method: GetQtVersion
Params: none Params: none

44
lcl/interfaces/qt5/qtwinapi.inc
View File

@ -1846,20 +1846,7 @@ var
Font := QFont_create(@WStr); Font := QFont_create(@WStr);
ALogFontA.lfItalic := Byte(QFont_italic(Font)); ALogFontA.lfItalic := Byte(QFont_italic(Font));
FontWeight := QFont_weight(Font); FontWeight := QFont_weight(Font);
case FontWeight of ALogFontA.lfWeight := ConvertFontWeightToQtConst(FontWeight);
0: ALogFontA.lfWeight := FW_THIN;
12: ALogFontA.lfWeight := FW_EXTRALIGHT;
25: ALogFontA.lfWeight := FW_LIGHT;
50: ALogFontA.lfWeight := FW_NORMAL;
57: ALogFontA.lfWeight := FW_MEDIUM;
63: ALogFontA.lfWeight := FW_SEMIBOLD;
75: ALogFontA.lfWeight := FW_BOLD;
81: ALogFontA.lfWeight := FW_EXTRABOLD;
87: ALogFontA.lfWeight := FW_HEAVY;
else
ALogFontA.lfWeight := Round(FontWeight * 9.5);
end;
// ALogFontA.lfWeight := QFont_weight(Font);
ALogFontA.lfHeight := QFont_pointSize(Font); ALogFontA.lfHeight := QFont_pointSize(Font);
ALogFontA.lfUnderline := Byte(QFont_underline(Font)); ALogFontA.lfUnderline := Byte(QFont_underline(Font));
ALogFontA.lfStrikeOut := Byte(QFont_strikeOut(Font)); ALogFontA.lfStrikeOut := Byte(QFont_strikeOut(Font));
@ -3191,20 +3178,7 @@ begin
end else end else
ALogFont^.lfHeight := AFont.getPixelSize; ALogFont^.lfHeight := AFont.getPixelSize;
ALogFont^.lfEscapement := AFont.Angle; ALogFont^.lfEscapement := AFont.Angle;
case AFont.getWeight of ALogFont^.lfWeight := ConvertFontWeightToQtConst(AFont.getWeight);
0: ALogFont^.lfWeight := FW_THIN;
12: ALogFont^.lfWeight := FW_EXTRALIGHT;
25: ALogFont^.lfWeight := FW_LIGHT;
50: ALogFont^.lfWeight := FW_NORMAL;
57: ALogFont^.lfWeight := FW_MEDIUM;
63: ALogFont^.lfWeight := FW_SEMIBOLD;
75: ALogFont^.lfWeight := FW_BOLD;
81: ALogFont^.lfWeight := FW_EXTRABOLD;
87: ALogFont^.lfWeight := FW_HEAVY;
else
ALogFont^.lfWeight := Round(AFont.getWeight * 9.5);
end;
ALogFont^.lfItalic := Ord(AFont.getItalic) * High(Byte); ALogFont^.lfItalic := Ord(AFont.getItalic) * High(Byte);
ALogFont^.lfUnderline := Ord(AFont.getUnderline) * High(Byte); ALogFont^.lfUnderline := Ord(AFont.getUnderline) * High(Byte);
ALogFont^.lfStrikeOut := Ord(AFont.getStrikeOut) * High(Byte); ALogFont^.lfStrikeOut := Ord(AFont.getStrikeOut) * High(Byte);
@ -4354,19 +4328,7 @@ begin
TM.tmMaxCharWidth := QtFontMetrics.maxWidth; TM.tmMaxCharWidth := QtFontMetrics.maxWidth;
FontWeight := QtDC.font.getWeight; FontWeight := QtDC.font.getWeight;
case FontWeight of TM.tmWeight := ConvertFontWeightToQtConst(FontWeight);
0: TM.tmWeight := FW_THIN;
12: TM.tmWeight := FW_EXTRALIGHT;
25: TM.tmWeight := FW_LIGHT;
50: TM.tmWeight := FW_NORMAL;
57: TM.tmWeight := FW_MEDIUM;
63: TM.tmWeight := FW_SEMIBOLD;
75: TM.tmWeight := FW_BOLD;
81: TM.tmWeight := FW_EXTRABOLD;
87: TM.tmWeight := FW_HEAVY;
else
TM.tmWeight := Round(FontWeight * 9.5);
end;
TM.tmOverhang := 0; TM.tmOverhang := 0;
TM.tmDigitizedAspectX := 0; TM.tmDigitizedAspectX := 0;
TM.tmDigitizedAspectY := 0; TM.tmDigitizedAspectY := 0;