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

lcl: highDPI: rename AScaleFonts parameter to AScale0Fonts and change its behavior. Issue #31083

Browse Source 
git-svn-id: trunk@53594 -
This commit is contained in:
ondrej 2016-12-07 22:22:50 +00:00
parent 7d0f452c5b
commit e7b8a7cf27
12 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lcl/comctrls.pp
View File

@ -159,7 +159,7 @@ type
procedure LMDrawItem(var Message: TLMDrawItems); message LM_DRAWITEM; procedure LMDrawItem(var Message: TLMDrawItems); message LM_DRAWITEM;
procedure DoAutoAdjustLayout(const AMode: TLayoutAdjustmentPolicy; procedure DoAutoAdjustLayout(const AMode: TLayoutAdjustmentPolicy;
const AXProportion, AYProportion: Double; const AScaleFonts: Boolean); override; const AXProportion, AYProportion: Double; const AScale0Fonts: Boolean); override;
public public
constructor Create(TheOwner: TComponent); override; constructor Create(TheOwner: TComponent); override;
destructor Destroy; override; destructor Destroy; override;
@ -1484,7 +1484,7 @@ type
procedure DoItemChecked(AItem: TListItem); procedure DoItemChecked(AItem: TListItem);
procedure DoSelectItem(AItem: TListItem; ASelected: Boolean); virtual; procedure DoSelectItem(AItem: TListItem; ASelected: Boolean); virtual;
procedure DoAutoAdjustLayout(const AMode: TLayoutAdjustmentPolicy; 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 DoSetBounds(ALeft, ATop, AWidth, AHeight: integer); override;
procedure DoEndEdit(AItem: TListItem; const AValue: String); virtual; procedure DoEndEdit(AItem: TListItem; const AValue: String); virtual;
@ -2239,7 +2239,7 @@ type
Simulate: boolean): Boolean; Simulate: boolean): Boolean;
procedure CNDropDownClosed(var Message: TLMessage); message CN_DROPDOWNCLOSED; procedure CNDropDownClosed(var Message: TLMessage); message CN_DROPDOWNCLOSED;
procedure DoAutoAdjustLayout(const AMode: TLayoutAdjustmentPolicy; procedure DoAutoAdjustLayout(const AMode: TLayoutAdjustmentPolicy;
const AXProportion, AYProportion: Double; const AScaleFonts: Boolean); override; const AXProportion, AYProportion: Double; const AScale0Fonts: Boolean); override;
public public
constructor Create(TheOwner: TComponent); override; constructor Create(TheOwner: TComponent); override;
destructor Destroy; override; destructor Destroy; override;

6
lcl/controls.pp
View File

@ -1416,7 +1416,7 @@ type
function ColorIsStored: boolean; virtual; function ColorIsStored: boolean; virtual;
procedure DoAutoAdjustLayout(const AMode: TLayoutAdjustmentPolicy; procedure DoAutoAdjustLayout(const AMode: TLayoutAdjustmentPolicy;
const AXProportion, AYProportion: Double; const AXProportion, AYProportion: Double;
const AScaleFonts: Boolean); virtual; const AScale0Fonts: Boolean); virtual;
protected protected
// actions // actions
function GetActionLinkClass: TControlActionLinkClass; virtual; function GetActionLinkClass: TControlActionLinkClass; virtual;
@ -1534,7 +1534,7 @@ type
procedure WriteLayoutDebugReport(const Prefix: string); virtual; procedure WriteLayoutDebugReport(const Prefix: string); virtual;
procedure AutoAdjustLayout(AMode: TLayoutAdjustmentPolicy; procedure AutoAdjustLayout(AMode: TLayoutAdjustmentPolicy;
const AFromDPI, AToDPI, AOldFormWidth, ANewFormWidth: Integer; const AFromDPI, AToDPI, AOldFormWidth, ANewFormWidth: Integer;
const AScaleFonts: Boolean); virtual; const AScale0Fonts: Boolean); virtual;
procedure ShouldAutoAdjust(var AWidth, AHeight: Boolean); virtual; procedure ShouldAutoAdjust(var AWidth, AHeight: Boolean); virtual;
public public
constructor Create(TheOwner: TComponent);override; constructor Create(TheOwner: TComponent);override;
@ -2207,7 +2207,7 @@ type
procedure WriteLayoutDebugReport(const Prefix: string); override; procedure WriteLayoutDebugReport(const Prefix: string); override;
procedure AutoAdjustLayout(AMode: TLayoutAdjustmentPolicy; const AFromDPI, procedure AutoAdjustLayout(AMode: TLayoutAdjustmentPolicy; const AFromDPI,
AToDPI, AOldFormWidth, ANewFormWidth: Integer; AToDPI, AOldFormWidth, ANewFormWidth: Integer;
const AScaleFonts: Boolean); override; const AScale0Fonts: Boolean); override;
public public
constructor Create(TheOwner: TComponent);override; constructor Create(TheOwner: TComponent);override;
constructor CreateParented(AParentWindow: HWND); constructor CreateParented(AParentWindow: HWND);

2
lcl/forms.pp
View File

@ -259,7 +259,7 @@ type
procedure SetDesignTimePPI(const ADesignTimePPI: Integer); procedure SetDesignTimePPI(const ADesignTimePPI: Integer);
protected protected
procedure AutoAdjustLayout(AMode: TLayoutAdjustmentPolicy; const AFromDPI, procedure AutoAdjustLayout(AMode: TLayoutAdjustmentPolicy; const AFromDPI,
AToDPI, AOldFormWidth, ANewFormWidth: Integer; const AScaleFonts: Boolean); override; AToDPI, AOldFormWidth, ANewFormWidth: Integer; const AScale0Fonts: Boolean); override;
public public
constructor Create(TheOwner: TComponent); override; constructor Create(TheOwner: TComponent); override;
public public

6
lcl/grids.pas
View File

@ -953,7 +953,7 @@ type
function DoMouseWheelDown(Shift: TShiftState; MousePos: TPoint): Boolean; override; function DoMouseWheelDown(Shift: TShiftState; MousePos: TPoint): Boolean; override;
function DoMouseWheelUp(Shift: TShiftState; MousePos: TPoint): Boolean; override; function DoMouseWheelUp(Shift: TShiftState; MousePos: TPoint): Boolean; override;
procedure DoAutoAdjustLayout(const AMode: TLayoutAdjustmentPolicy; 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 DoOnChangeBounds; override;
procedure DoOPDeleteColRow(IsColumn: Boolean; index: Integer); procedure DoOPDeleteColRow(IsColumn: Boolean; index: Integer);
procedure DoOPExchangeColRow(IsColumn: Boolean; index, WithIndex: Integer); procedure DoOPExchangeColRow(IsColumn: Boolean; index, WithIndex: Integer);
@ -6720,12 +6720,12 @@ begin
end; end;
procedure TCustomGrid.DoAutoAdjustLayout(const AMode: TLayoutAdjustmentPolicy; procedure TCustomGrid.DoAutoAdjustLayout(const AMode: TLayoutAdjustmentPolicy;
const AXProportion, AYProportion: Double; const AScaleFonts: Boolean); const AXProportion, AYProportion: Double; const AScale0Fonts: Boolean);
var var
i: Integer; i: Integer;
C: TGridColumn; C: TGridColumn;
begin begin
inherited DoAutoAdjustLayout(AMode, AXProportion, AYProportion, AScaleFonts); inherited DoAutoAdjustLayout(AMode, AXProportion, AYProportion, AScale0Fonts);
if AMode in [lapAutoAdjustWithoutHorizontalScrolling, lapAutoAdjustForDPI] then if AMode in [lapAutoAdjustWithoutHorizontalScrolling, lapAutoAdjustForDPI] then
begin begin

8
lcl/include/control.inc
View File

@ -2945,13 +2945,13 @@ begin
end; end;
procedure TControl.DoAutoAdjustLayout(const AMode: TLayoutAdjustmentPolicy; procedure TControl.DoAutoAdjustLayout(const AMode: TLayoutAdjustmentPolicy;
const AXProportion, AYProportion: Double; const AScaleFonts: Boolean); const AXProportion, AYProportion: Double; const AScale0Fonts: Boolean);
var var
AAWidth, AAHeight: Boolean; AAWidth, AAHeight: Boolean;
NewLeft, NewTop, NewWidth, NewHeight, OldWidth, OldHeight: Integer; NewLeft, NewTop, NewWidth, NewHeight, OldWidth, OldHeight: Integer;
NewRight, NewBottom: Int64; NewRight, NewBottom: Int64;
begin 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); Font.Height := Round(GetFontData(Font.Reference.Handle).Height*AYProportion);
// Apply the changes // Apply the changes
@ -3962,7 +3962,7 @@ end;
procedure TControl.AutoAdjustLayout(AMode: TLayoutAdjustmentPolicy; procedure TControl.AutoAdjustLayout(AMode: TLayoutAdjustmentPolicy;
const AFromDPI, AToDPI, AOldFormWidth, ANewFormWidth: Integer; const AFromDPI, AToDPI, AOldFormWidth, ANewFormWidth: Integer;
const AScaleFonts: Boolean); const AScale0Fonts: Boolean);
var var
lXProportion, lYProportion: Double; lXProportion, lYProportion: Double;
lMode: TLayoutAdjustmentPolicy; lMode: TLayoutAdjustmentPolicy;
@ -3986,7 +3986,7 @@ begin
if AFromDPI > 0 then lYProportion := AToDPI / AFromDPI if AFromDPI > 0 then lYProportion := AToDPI / AFromDPI
else lYProportion := 1.0; else lYProportion := 1.0;
DoAutoAdjustLayout(lMode, lXProportion, lYProportion, AScaleFonts); DoAutoAdjustLayout(lMode, lXProportion, lYProportion, AScale0Fonts);
end; end;
// Auto-adjust the layout of controls. // Auto-adjust the layout of controls.

4
lcl/include/customdesigncontrol.inc
View File

@ -21,10 +21,10 @@ end;
procedure TCustomDesignControl.AutoAdjustLayout(AMode: TLayoutAdjustmentPolicy; procedure TCustomDesignControl.AutoAdjustLayout(AMode: TLayoutAdjustmentPolicy;
const AFromDPI, AToDPI, AOldFormWidth, ANewFormWidth: Integer; const AFromDPI, AToDPI, AOldFormWidth, ANewFormWidth: Integer;
const AScaleFonts: Boolean); const AScale0Fonts: Boolean);
begin begin
inherited AutoAdjustLayout(AMode, AFromDPI, AToDPI, AOldFormWidth, inherited AutoAdjustLayout(AMode, AFromDPI, AToDPI, AOldFormWidth,
ANewFormWidth, AScaleFonts); ANewFormWidth, AScale0Fonts);
FPixelsPerInch := AToDPI; FPixelsPerInch := AToDPI;
end; end;

4
lcl/include/customlistbox.inc
View File

@ -469,9 +469,9 @@ begin
end; end;
procedure TCustomListBox.DoAutoAdjustLayout(const AMode: TLayoutAdjustmentPolicy; procedure TCustomListBox.DoAutoAdjustLayout(const AMode: TLayoutAdjustmentPolicy;
const AXProportion, AYProportion: Double; const AScaleFonts: Boolean); const AXProportion, AYProportion: Double; const AScale0Fonts: Boolean);
begin begin
inherited DoAutoAdjustLayout(AMode, AXProportion, AYProportion, AScaleFonts); inherited DoAutoAdjustLayout(AMode, AXProportion, AYProportion, AScale0Fonts);
if AMode in [lapAutoAdjustWithoutHorizontalScrolling, lapAutoAdjustForDPI] then if AMode in [lapAutoAdjustWithoutHorizontalScrolling, lapAutoAdjustForDPI] then
begin begin

4
lcl/include/customlistview.inc
View File

@ -612,12 +612,12 @@ begin
end; end;
procedure TCustomListView.DoAutoAdjustLayout(const AMode: TLayoutAdjustmentPolicy; procedure TCustomListView.DoAutoAdjustLayout(const AMode: TLayoutAdjustmentPolicy;
const AXProportion, AYProportion: Double; const AScaleFonts: Boolean); const AXProportion, AYProportion: Double; const AScale0Fonts: Boolean);
var var
i: Integer; i: Integer;
C: TListColumn; C: TListColumn;
begin begin
inherited DoAutoAdjustLayout(AMode, AXProportion, AYProportion, AScaleFonts); inherited DoAutoAdjustLayout(AMode, AXProportion, AYProportion, AScale0Fonts);
if AMode in [lapAutoAdjustWithoutHorizontalScrolling, lapAutoAdjustForDPI] then if AMode in [lapAutoAdjustWithoutHorizontalScrolling, lapAutoAdjustForDPI] then
begin begin

4
lcl/include/statusbar.inc
View File

@ -148,11 +148,11 @@ begin
end; end;
procedure TStatusBar.DoAutoAdjustLayout(const AMode: TLayoutAdjustmentPolicy; procedure TStatusBar.DoAutoAdjustLayout(const AMode: TLayoutAdjustmentPolicy;
const AXProportion, AYProportion: Double; const AScaleFonts: Boolean); const AXProportion, AYProportion: Double; const AScale0Fonts: Boolean);
var var
I: Integer; I: Integer;
begin begin
inherited DoAutoAdjustLayout(AMode, AXProportion, AYProportion, AScaleFonts); inherited DoAutoAdjustLayout(AMode, AXProportion, AYProportion, AScale0Fonts);
if AMode in [lapAutoAdjustWithoutHorizontalScrolling, lapAutoAdjustForDPI] then if AMode in [lapAutoAdjustWithoutHorizontalScrolling, lapAutoAdjustForDPI] then
begin begin

4
lcl/include/toolbar.inc
View File

@ -342,9 +342,9 @@ begin
end; end;
procedure TToolBar.DoAutoAdjustLayout(const AMode: TLayoutAdjustmentPolicy; procedure TToolBar.DoAutoAdjustLayout(const AMode: TLayoutAdjustmentPolicy;
const AXProportion, AYProportion: Double; const AScaleFonts: Boolean); const AXProportion, AYProportion: Double; const AScale0Fonts: Boolean);
begin begin
inherited DoAutoAdjustLayout(AMode, AXProportion, AYProportion, AScaleFonts); inherited DoAutoAdjustLayout(AMode, AXProportion, AYProportion, AScale0Fonts);
if AMode in [lapAutoAdjustWithoutHorizontalScrolling, lapAutoAdjustForDPI] then if AMode in [lapAutoAdjustWithoutHorizontalScrolling, lapAutoAdjustForDPI] then
begin begin

6
lcl/include/wincontrol.inc
View File

@ -3837,14 +3837,14 @@ end;
procedure TWinControl.AutoAdjustLayout(AMode: TLayoutAdjustmentPolicy; procedure TWinControl.AutoAdjustLayout(AMode: TLayoutAdjustmentPolicy;
const AFromDPI, AToDPI, AOldFormWidth, ANewFormWidth: Integer; const AFromDPI, AToDPI, AOldFormWidth, ANewFormWidth: Integer;
const AScaleFonts: Boolean); const AScale0Fonts: Boolean);
var var
i: Integer; i: Integer;
begin begin
for i:=0 to ControlCount-1 do 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; end;
{------------------------------------------------------------------------------ {------------------------------------------------------------------------------

2
lcl/stdctrls.pp
View File

@ -545,7 +545,7 @@ type
procedure SetStyle(Val: TListBoxStyle); virtual; procedure SetStyle(Val: TListBoxStyle); virtual;
procedure DrawItem(Index: Integer; ARect: TRect; State: TOwnerDrawState); virtual; procedure DrawItem(Index: Integer; ARect: TRect; State: TOwnerDrawState); virtual;
procedure DoAutoAdjustLayout(const AMode: TLayoutAdjustmentPolicy; procedure DoAutoAdjustLayout(const AMode: TLayoutAdjustmentPolicy;
const AXProportion, AYProportion: Double; const AScaleFonts: Boolean); const AXProportion, AYProportion: Double; const AScale0Fonts: Boolean);
override; override;
procedure DoSelectionChange(User: Boolean); virtual; procedure DoSelectionChange(User: Boolean); virtual;
procedure SendItemIndex; procedure SendItemIndex;