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

(cherry picked from commit 95da3f4854)
This commit is contained in:
wp_xyz 2021-09-10 21:05:39 +02:00
parent 6e5e5b67df
commit 802dfb0ead

View File

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