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

Revert TFontStyles to the original size

Browse Source
This commit is contained in:
Ondrej Pokorny 2022-12-18 11:18:03 +01:00
parent fe6b88d8da
commit 99caa084fc
3 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/lazreport/source/fr3tolrf.pas
View File

@ -126,7 +126,7 @@ end;
function DelphiIntToFpcFontStyle(aStyle: Integer): TFontStyles; function DelphiIntToFpcFontStyle(aStyle: Integer): TFontStyles;
begin begin
result := TFontStyles(Byte(aStyle)); result := TFontStyles(aStyle);
end; end;
function DelphiIntToFPCFrameBorders(aFrameTyp: Integer): TfrFrameBorders; function DelphiIntToFPCFrameBorders(aFrameTyp: Integer): TfrFrameBorders;

8
components/virtualtreeview/laz.virtualtrees.pas
View File

@ -11757,11 +11757,7 @@ begin
ReadBuffer(Dummy, SizeOf(Dummy)); ReadBuffer(Dummy, SizeOf(Dummy));
Pitch := TFontPitch(Dummy); Pitch := TFontPitch(Dummy);
ReadBuffer(Dummy, SizeOf(Dummy)); ReadBuffer(Dummy, SizeOf(Dummy));
{$IF FPC_FULLVERSION>30300}
Style := TFontStyles(Byte(Dummy));
{$ELSE}
Style := TFontStyles(LongWord(Dummy)); Style := TFontStyles(LongWord(Dummy));
{$ENDIF}
end; end;
// LCL port started with header stream version 6 so no need to do the check here // LCL port started with header stream version 6 so no need to do the check here
// Read data introduced by stream version 1+. // Read data introduced by stream version 1+.
@ -12034,11 +12030,7 @@ begin
WriteBuffer(PAnsiChar(Tmp)^, Dummy); WriteBuffer(PAnsiChar(Tmp)^, Dummy);
Dummy := Ord(Pitch); Dummy := Ord(Pitch);
WriteBuffer(Dummy, SizeOf(Dummy)); WriteBuffer(Dummy, SizeOf(Dummy));
{$IF FPC_FULLVERSION>30300}
Dummy := Byte(Style);
{$ELSE}
Dummy := Integer(Style); Dummy := Integer(Style);
{$ENDIF}
WriteBuffer(Dummy, SizeOf(Dummy)); WriteBuffer(Dummy, SizeOf(Dummy));
end; end;

8
lcl/grids.pas
View File

@ -2136,11 +2136,7 @@ begin
cfg.SetValue(AKey + '/name/value', AFont.Name); cfg.SetValue(AKey + '/name/value', AFont.Name);
cfg.SetValue(AKey + '/size/value', AFont.Size); cfg.SetValue(AKey + '/size/value', AFont.Size);
cfg.SetValue(AKey + '/color/value', ColorToString(AFont.Color)); cfg.SetValue(AKey + '/color/value', ColorToString(AFont.Color));
{$IF FPC_FULLVERSION>=30300}
cfg.SetValue(AKey + '/style/value', Byte(AFont.Style));
{$ELSE}
cfg.SetValue(AKey + '/style/value', Integer(AFont.Style)); cfg.SetValue(AKey + '/style/value', Integer(AFont.Style));
{$ENDIF}
end; end;
procedure CfgGetFontValue(cfg: TXMLConfig; AKey: WideString; AFont: TFont); procedure CfgGetFontValue(cfg: TXMLConfig; AKey: WideString; AFont: TFont);
@ -2148,11 +2144,7 @@ begin
AFont.Name := cfg.GetValue(AKey + '/name/value', 'default'); AFont.Name := cfg.GetValue(AKey + '/name/value', 'default');
AFont.Size := cfg.GetValue(AKey + '/size/value', 0); AFont.Size := cfg.GetValue(AKey + '/size/value', 0);
AFont.Color:= StringToColor(cfg.GetValue(AKey + '/color/value', 'clWindowText')); AFont.Color:= StringToColor(cfg.GetValue(AKey + '/color/value', 'clWindowText'));
{$IF FPC_FULLVERSION>=30300}
AFont.Style:= TFontStyles(Byte(cfg.GetValue(AKey + '/style/value', 0)));
{$ELSE}
AFont.Style:= TFontStyles(cfg.GetValue(AKey + '/style/value', 0)); AFont.Style:= TFontStyles(cfg.GetValue(AKey + '/style/value', 0));
{$ENDIF}
end; end;
// Draws a dotted rectangle by drawing each enabled side. By default all sides are // Draws a dotted rectangle by drawing each enabled side. By default all sides are