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

LCL: remove double with, issue #33609

Browse Source 
git-svn-id: trunk@57671 -
This commit is contained in:
ondrej 2018-04-19 09:59:07 +00:00
parent 20ed315426
commit fe7f95b869
1 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
lcl/include/font.inc
View File

@ -689,28 +689,22 @@ var
begin
BeginUpdate;
try
with ALogFont do
begin
Height := ALogFont.lfHeight;
Charset := TFontCharset(ALogFont.lfCharSet);
AStyle := [];
with ALogFont do
begin
if lfWeight >= FW_SEMIBOLD then Include(AStyle, fsBold);
if lfItalic <> 0 then Include(AStyle, fsItalic);
if lfUnderline <> 0 then Include(AStyle, fsUnderline);
if lfStrikeOut <> 0 then Include(AStyle, fsStrikeOut);
end;
if (FIXED_PITCH and lfPitchAndFamily) <> 0 then
Pitch := fpFixed
else if (VARIABLE_PITCH and lfPitchAndFamily) <> 0 then
Pitch := fpVariable
else
Pitch := fpDefault;
Style := AStyle;
Quality := TFontQuality(ALogFont.lfQuality);
Name := ALogFont.lfFaceName;
end;
Height := ALogFont.lfHeight;
Charset := TFontCharset(ALogFont.lfCharSet);
AStyle := [];
if ALogFont.lfWeight >= FW_SEMIBOLD then Include(AStyle, fsBold);
if ALogFont.lfItalic <> 0 then Include(AStyle, fsItalic);
if ALogFont.lfUnderline <> 0 then Include(AStyle, fsUnderline);
if ALogFont.lfStrikeOut <> 0 then Include(AStyle, fsStrikeOut);
if (FIXED_PITCH and ALogFont.lfPitchAndFamily) <> 0 then
Pitch := fpFixed
else if (VARIABLE_PITCH and ALogFont.lfPitchAndFamily) <> 0 then
Pitch := fpVariable
else
Pitch := fpDefault;
Style := AStyle;
Quality := TFontQuality(ALogFont.lfQuality);
Name := ALogFont.lfFaceName;
finally
EndUpdate;
end;