paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-17 04:29:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

LCL/LCLScaling: Fix ParentFont becoming to false upon scaling. Issue #37299.

Browse Source
This commit is contained in:
wp_xyz 2021-09-10 21:05:39 +02:00
parent eaea82f052
commit 95da3f4854
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lcl/include/control.inc
View File

@ -4178,6 +4178,7 @@ procedure TControl.AutoAdjustLayout(AMode: TLayoutAdjustmentPolicy;
var var
lXProportion, lYProportion: Double; lXProportion, lYProportion: Double;
lMode: TLayoutAdjustmentPolicy; lMode: TLayoutAdjustmentPolicy;
savedParentFont: Boolean;
begin begin
// First resolve ladDefault // First resolve ladDefault
lMode := AMode; lMode := AMode;
@ -4199,12 +4200,14 @@ begin
else lYProportion := 1.0; else lYProportion := 1.0;
DisableAutoSizing{$IFDEF DebugDisableAutoSizing}('TControl.AutoAdjustLayout'){$ENDIF}; DisableAutoSizing{$IFDEF DebugDisableAutoSizing}('TControl.AutoAdjustLayout'){$ENDIF};
savedParentFont := ParentFont;
try try
if AMode in [lapAutoAdjustWithoutHorizontalScrolling, lapAutoAdjustForDPI] then if AMode in [lapAutoAdjustWithoutHorizontalScrolling, lapAutoAdjustForDPI] then
ScaleFontsPPI(AToPPI, lYProportion); ScaleFontsPPI(AToPPI, lYProportion);
DoAutoAdjustLayout(lMode, lXProportion, lYProportion); DoAutoAdjustLayout(lMode, lXProportion, lYProportion);
finally finally
ParentFont := savedParentFont;
EnableAutoSizing{$IFDEF DebugDisableAutoSizing}('TControl.AutoAdjustLayout'){$ENDIF}; EnableAutoSizing{$IFDEF DebugDisableAutoSizing}('TControl.AutoAdjustLayout'){$ENDIF};
end; end;
end; end;