From 95da3f4854315c8434f60373604636cf5de1408c Mon Sep 17 00:00:00 2001 From: wp_xyz Date: Fri, 10 Sep 2021 21:05:39 +0200 Subject: [PATCH] LCL/LCLScaling: Fix ParentFont becoming to false upon scaling. Issue #37299. --- lcl/include/control.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lcl/include/control.inc b/lcl/include/control.inc index 513fc3f3d8..920de0b151 100644 --- a/lcl/include/control.inc +++ b/lcl/include/control.inc @@ -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;