mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-04-19 11:49:28 +02:00
LCL/LCLScaling: Fix ParentFont becoming to false upon scaling. Issue #37299.
(cherry picked from commit 95da3f4854
)
This commit is contained in:
parent
6e5e5b67df
commit
802dfb0ead
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user