From e7b8a7cf27c7096b2df20efe336bcffb431c3255 Mon Sep 17 00:00:00 2001 From: ondrej Date: Wed, 7 Dec 2016 22:22:50 +0000 Subject: [PATCH] lcl: highDPI: rename AScaleFonts parameter to AScale0Fonts and change its behavior. Issue #31083 git-svn-id: trunk@53594 - --- lcl/comctrls.pp | 6 +++--- lcl/controls.pp | 6 +++--- lcl/forms.pp | 2 +- lcl/grids.pas | 6 +++--- lcl/include/control.inc | 8 ++++---- lcl/include/customdesigncontrol.inc | 4 ++-- lcl/include/customlistbox.inc | 4 ++-- lcl/include/customlistview.inc | 4 ++-- lcl/include/statusbar.inc | 4 ++-- lcl/include/toolbar.inc | 4 ++-- lcl/include/wincontrol.inc | 6 +++--- lcl/stdctrls.pp | 2 +- 12 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lcl/comctrls.pp b/lcl/comctrls.pp index 2de13f6452..9cddf1c57b 100644 --- a/lcl/comctrls.pp +++ b/lcl/comctrls.pp @@ -159,7 +159,7 @@ type procedure LMDrawItem(var Message: TLMDrawItems); message LM_DRAWITEM; procedure DoAutoAdjustLayout(const AMode: TLayoutAdjustmentPolicy; - const AXProportion, AYProportion: Double; const AScaleFonts: Boolean); override; + const AXProportion, AYProportion: Double; const AScale0Fonts: Boolean); override; public constructor Create(TheOwner: TComponent); override; destructor Destroy; override; @@ -1484,7 +1484,7 @@ type procedure DoItemChecked(AItem: TListItem); procedure DoSelectItem(AItem: TListItem; ASelected: Boolean); virtual; procedure DoAutoAdjustLayout(const AMode: TLayoutAdjustmentPolicy; - const AXProportion, AYProportion: Double; const AScaleFonts: Boolean); override; + const AXProportion, AYProportion: Double; const AScale0Fonts: Boolean); override; procedure DoSetBounds(ALeft, ATop, AWidth, AHeight: integer); override; procedure DoEndEdit(AItem: TListItem; const AValue: String); virtual; @@ -2239,7 +2239,7 @@ type Simulate: boolean): Boolean; procedure CNDropDownClosed(var Message: TLMessage); message CN_DROPDOWNCLOSED; procedure DoAutoAdjustLayout(const AMode: TLayoutAdjustmentPolicy; - const AXProportion, AYProportion: Double; const AScaleFonts: Boolean); override; + const AXProportion, AYProportion: Double; const AScale0Fonts: Boolean); override; public constructor Create(TheOwner: TComponent); override; destructor Destroy; override; diff --git a/lcl/controls.pp b/lcl/controls.pp index 36bbcd4ff8..4ac34f438c 100644 --- a/lcl/controls.pp +++ b/lcl/controls.pp @@ -1416,7 +1416,7 @@ type function ColorIsStored: boolean; virtual; procedure DoAutoAdjustLayout(const AMode: TLayoutAdjustmentPolicy; const AXProportion, AYProportion: Double; - const AScaleFonts: Boolean); virtual; + const AScale0Fonts: Boolean); virtual; protected // actions function GetActionLinkClass: TControlActionLinkClass; virtual; @@ -1534,7 +1534,7 @@ type procedure WriteLayoutDebugReport(const Prefix: string); virtual; procedure AutoAdjustLayout(AMode: TLayoutAdjustmentPolicy; const AFromDPI, AToDPI, AOldFormWidth, ANewFormWidth: Integer; - const AScaleFonts: Boolean); virtual; + const AScale0Fonts: Boolean); virtual; procedure ShouldAutoAdjust(var AWidth, AHeight: Boolean); virtual; public constructor Create(TheOwner: TComponent);override; @@ -2207,7 +2207,7 @@ type procedure WriteLayoutDebugReport(const Prefix: string); override; procedure AutoAdjustLayout(AMode: TLayoutAdjustmentPolicy; const AFromDPI, AToDPI, AOldFormWidth, ANewFormWidth: Integer; - const AScaleFonts: Boolean); override; + const AScale0Fonts: Boolean); override; public constructor Create(TheOwner: TComponent);override; constructor CreateParented(AParentWindow: HWND); diff --git a/lcl/forms.pp b/lcl/forms.pp index 54fd09d59f..cb1d2d7aa4 100644 --- a/lcl/forms.pp +++ b/lcl/forms.pp @@ -259,7 +259,7 @@ type procedure SetDesignTimePPI(const ADesignTimePPI: Integer); protected procedure AutoAdjustLayout(AMode: TLayoutAdjustmentPolicy; const AFromDPI, - AToDPI, AOldFormWidth, ANewFormWidth: Integer; const AScaleFonts: Boolean); override; + AToDPI, AOldFormWidth, ANewFormWidth: Integer; const AScale0Fonts: Boolean); override; public constructor Create(TheOwner: TComponent); override; public diff --git a/lcl/grids.pas b/lcl/grids.pas index 82a15b9d60..3c9bf3223a 100644 --- a/lcl/grids.pas +++ b/lcl/grids.pas @@ -953,7 +953,7 @@ type function DoMouseWheelDown(Shift: TShiftState; MousePos: TPoint): Boolean; override; function DoMouseWheelUp(Shift: TShiftState; MousePos: TPoint): Boolean; override; procedure DoAutoAdjustLayout(const AMode: TLayoutAdjustmentPolicy; - const AXProportion, AYProportion: Double; const AScaleFonts: Boolean); override; + const AXProportion, AYProportion: Double; const AScale0Fonts: Boolean); override; procedure DoOnChangeBounds; override; procedure DoOPDeleteColRow(IsColumn: Boolean; index: Integer); procedure DoOPExchangeColRow(IsColumn: Boolean; index, WithIndex: Integer); @@ -6720,12 +6720,12 @@ begin end; procedure TCustomGrid.DoAutoAdjustLayout(const AMode: TLayoutAdjustmentPolicy; - const AXProportion, AYProportion: Double; const AScaleFonts: Boolean); + const AXProportion, AYProportion: Double; const AScale0Fonts: Boolean); var i: Integer; C: TGridColumn; begin - inherited DoAutoAdjustLayout(AMode, AXProportion, AYProportion, AScaleFonts); + inherited DoAutoAdjustLayout(AMode, AXProportion, AYProportion, AScale0Fonts); if AMode in [lapAutoAdjustWithoutHorizontalScrolling, lapAutoAdjustForDPI] then begin diff --git a/lcl/include/control.inc b/lcl/include/control.inc index a39023258f..e116cbda61 100644 --- a/lcl/include/control.inc +++ b/lcl/include/control.inc @@ -2945,13 +2945,13 @@ begin end; procedure TControl.DoAutoAdjustLayout(const AMode: TLayoutAdjustmentPolicy; - const AXProportion, AYProportion: Double; const AScaleFonts: Boolean); + const AXProportion, AYProportion: Double; const AScale0Fonts: Boolean); var AAWidth, AAHeight: Boolean; NewLeft, NewTop, NewWidth, NewHeight, OldWidth, OldHeight: Integer; NewRight, NewBottom: Int64; begin - if AScaleFonts and not ParentFont then + if (AScale0Fonts or (Font.Height<>0)) and not ParentFont then Font.Height := Round(GetFontData(Font.Reference.Handle).Height*AYProportion); // Apply the changes @@ -3962,7 +3962,7 @@ end; procedure TControl.AutoAdjustLayout(AMode: TLayoutAdjustmentPolicy; const AFromDPI, AToDPI, AOldFormWidth, ANewFormWidth: Integer; - const AScaleFonts: Boolean); + const AScale0Fonts: Boolean); var lXProportion, lYProportion: Double; lMode: TLayoutAdjustmentPolicy; @@ -3986,7 +3986,7 @@ begin if AFromDPI > 0 then lYProportion := AToDPI / AFromDPI else lYProportion := 1.0; - DoAutoAdjustLayout(lMode, lXProportion, lYProportion, AScaleFonts); + DoAutoAdjustLayout(lMode, lXProportion, lYProportion, AScale0Fonts); end; // Auto-adjust the layout of controls. diff --git a/lcl/include/customdesigncontrol.inc b/lcl/include/customdesigncontrol.inc index 9f6c0288e7..8d4a99761c 100644 --- a/lcl/include/customdesigncontrol.inc +++ b/lcl/include/customdesigncontrol.inc @@ -21,10 +21,10 @@ end; procedure TCustomDesignControl.AutoAdjustLayout(AMode: TLayoutAdjustmentPolicy; const AFromDPI, AToDPI, AOldFormWidth, ANewFormWidth: Integer; - const AScaleFonts: Boolean); + const AScale0Fonts: Boolean); begin inherited AutoAdjustLayout(AMode, AFromDPI, AToDPI, AOldFormWidth, - ANewFormWidth, AScaleFonts); + ANewFormWidth, AScale0Fonts); FPixelsPerInch := AToDPI; end; diff --git a/lcl/include/customlistbox.inc b/lcl/include/customlistbox.inc index 0e72dec76d..a9317ecfbe 100644 --- a/lcl/include/customlistbox.inc +++ b/lcl/include/customlistbox.inc @@ -469,9 +469,9 @@ begin end; procedure TCustomListBox.DoAutoAdjustLayout(const AMode: TLayoutAdjustmentPolicy; - const AXProportion, AYProportion: Double; const AScaleFonts: Boolean); + const AXProportion, AYProportion: Double; const AScale0Fonts: Boolean); begin - inherited DoAutoAdjustLayout(AMode, AXProportion, AYProportion, AScaleFonts); + inherited DoAutoAdjustLayout(AMode, AXProportion, AYProportion, AScale0Fonts); if AMode in [lapAutoAdjustWithoutHorizontalScrolling, lapAutoAdjustForDPI] then begin diff --git a/lcl/include/customlistview.inc b/lcl/include/customlistview.inc index 0e2bd08e43..faadecd6cc 100644 --- a/lcl/include/customlistview.inc +++ b/lcl/include/customlistview.inc @@ -612,12 +612,12 @@ begin end; procedure TCustomListView.DoAutoAdjustLayout(const AMode: TLayoutAdjustmentPolicy; - const AXProportion, AYProportion: Double; const AScaleFonts: Boolean); + const AXProportion, AYProportion: Double; const AScale0Fonts: Boolean); var i: Integer; C: TListColumn; begin - inherited DoAutoAdjustLayout(AMode, AXProportion, AYProportion, AScaleFonts); + inherited DoAutoAdjustLayout(AMode, AXProportion, AYProportion, AScale0Fonts); if AMode in [lapAutoAdjustWithoutHorizontalScrolling, lapAutoAdjustForDPI] then begin diff --git a/lcl/include/statusbar.inc b/lcl/include/statusbar.inc index fe2d1caef3..4657be82f9 100644 --- a/lcl/include/statusbar.inc +++ b/lcl/include/statusbar.inc @@ -148,11 +148,11 @@ begin end; procedure TStatusBar.DoAutoAdjustLayout(const AMode: TLayoutAdjustmentPolicy; - const AXProportion, AYProportion: Double; const AScaleFonts: Boolean); + const AXProportion, AYProportion: Double; const AScale0Fonts: Boolean); var I: Integer; begin - inherited DoAutoAdjustLayout(AMode, AXProportion, AYProportion, AScaleFonts); + inherited DoAutoAdjustLayout(AMode, AXProportion, AYProportion, AScale0Fonts); if AMode in [lapAutoAdjustWithoutHorizontalScrolling, lapAutoAdjustForDPI] then begin diff --git a/lcl/include/toolbar.inc b/lcl/include/toolbar.inc index 65876da7f7..a255a64554 100644 --- a/lcl/include/toolbar.inc +++ b/lcl/include/toolbar.inc @@ -342,9 +342,9 @@ begin end; procedure TToolBar.DoAutoAdjustLayout(const AMode: TLayoutAdjustmentPolicy; - const AXProportion, AYProportion: Double; const AScaleFonts: Boolean); + const AXProportion, AYProportion: Double; const AScale0Fonts: Boolean); begin - inherited DoAutoAdjustLayout(AMode, AXProportion, AYProportion, AScaleFonts); + inherited DoAutoAdjustLayout(AMode, AXProportion, AYProportion, AScale0Fonts); if AMode in [lapAutoAdjustWithoutHorizontalScrolling, lapAutoAdjustForDPI] then begin diff --git a/lcl/include/wincontrol.inc b/lcl/include/wincontrol.inc index 62a4953881..b968ab6ec9 100644 --- a/lcl/include/wincontrol.inc +++ b/lcl/include/wincontrol.inc @@ -3837,14 +3837,14 @@ end; procedure TWinControl.AutoAdjustLayout(AMode: TLayoutAdjustmentPolicy; const AFromDPI, AToDPI, AOldFormWidth, ANewFormWidth: Integer; - const AScaleFonts: Boolean); + const AScale0Fonts: Boolean); var i: Integer; begin for i:=0 to ControlCount-1 do - Controls[i].AutoAdjustLayout(AMode, AFromDPI, AToDPI, AOldFormWidth, ANewFormWidth, AScaleFonts); + Controls[i].AutoAdjustLayout(AMode, AFromDPI, AToDPI, AOldFormWidth, ANewFormWidth, AScale0Fonts); - inherited AutoAdjustLayout(AMode, AFromDPI, AToDPI, AOldFormWidth, ANewFormWidth, AScaleFonts); + inherited AutoAdjustLayout(AMode, AFromDPI, AToDPI, AOldFormWidth, ANewFormWidth, AScale0Fonts); end; {------------------------------------------------------------------------------ diff --git a/lcl/stdctrls.pp b/lcl/stdctrls.pp index ce950d77ee..fcbaad7c7b 100644 --- a/lcl/stdctrls.pp +++ b/lcl/stdctrls.pp @@ -545,7 +545,7 @@ type procedure SetStyle(Val: TListBoxStyle); virtual; procedure DrawItem(Index: Integer; ARect: TRect; State: TOwnerDrawState); virtual; procedure DoAutoAdjustLayout(const AMode: TLayoutAdjustmentPolicy; - const AXProportion, AYProportion: Double; const AScaleFonts: Boolean); + const AXProportion, AYProportion: Double; const AScale0Fonts: Boolean); override; procedure DoSelectionChange(User: Boolean); virtual; procedure SendItemIndex;