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

LCL: rename DPI parameters to PPI

Browse Source 
git-svn-id: trunk@54218 -
This commit is contained in:
ondrej 2017-02-21 10:56:42 +00:00
parent 4de009ab5e
commit eeff7db7c3
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lcl/controls.pp
View File

@ -1540,7 +1540,7 @@ type
public public
// LCL Scaling (High-DPI) // LCL Scaling (High-DPI)
procedure AutoAdjustLayout(AMode: TLayoutAdjustmentPolicy; procedure AutoAdjustLayout(AMode: TLayoutAdjustmentPolicy;
const AFromDPI, AToDPI, AOldFormWidth, ANewFormWidth: Integer); virtual; const AFromPPI, AToPPI, AOldFormWidth, ANewFormWidth: Integer); virtual;
procedure ShouldAutoAdjust(var AWidth, AHeight: Boolean); virtual; procedure ShouldAutoAdjust(var AWidth, AHeight: Boolean); virtual;
procedure FixDesignFontsPPI(const ADesignTimePPI: Integer); virtual; procedure FixDesignFontsPPI(const ADesignTimePPI: Integer); virtual;
procedure ScaleFontsPPI(const AProportion: Double); virtual; procedure ScaleFontsPPI(const AProportion: Double); virtual;
@ -2214,8 +2214,8 @@ type
procedure ScrollBy_WS(DeltaX, DeltaY: Integer); procedure ScrollBy_WS(DeltaX, DeltaY: Integer);
procedure ScrollBy(DeltaX, DeltaY: Integer); virtual; procedure ScrollBy(DeltaX, DeltaY: Integer); virtual;
procedure WriteLayoutDebugReport(const Prefix: string); override; procedure WriteLayoutDebugReport(const Prefix: string); override;
procedure AutoAdjustLayout(AMode: TLayoutAdjustmentPolicy; const AFromDPI, procedure AutoAdjustLayout(AMode: TLayoutAdjustmentPolicy; const AFromPPI,
AToDPI, AOldFormWidth, ANewFormWidth: Integer); override; AToPPI, AOldFormWidth, ANewFormWidth: Integer); override;
public public
constructor Create(TheOwner: TComponent);override; constructor Create(TheOwner: TComponent);override;
constructor CreateParented(AParentWindow: HWND); constructor CreateParented(AParentWindow: HWND);

4
lcl/forms.pp
View File

@ -265,8 +265,8 @@ type
protected protected
procedure SetScaled(const AScaled: Boolean); virtual; procedure SetScaled(const AScaled: Boolean); virtual;
procedure AutoAdjustLayout(AMode: TLayoutAdjustmentPolicy; const AFromDPI, procedure AutoAdjustLayout(AMode: TLayoutAdjustmentPolicy; const AFromPPI,
AToDPI, AOldFormWidth, ANewFormWidth: Integer); override; AToPPI, AOldFormWidth, ANewFormWidth: Integer); override;
procedure Loaded; override; procedure Loaded; override;
public public
constructor Create(TheOwner: TComponent); override; constructor Create(TheOwner: TComponent); override;

6
lcl/include/control.inc
View File

@ -4006,7 +4006,7 @@ begin
end; end;
procedure TControl.AutoAdjustLayout(AMode: TLayoutAdjustmentPolicy; procedure TControl.AutoAdjustLayout(AMode: TLayoutAdjustmentPolicy;
const AFromDPI, AToDPI, AOldFormWidth, ANewFormWidth: Integer); const AFromPPI, AToPPI, AOldFormWidth, ANewFormWidth: Integer);
var var
lXProportion, lYProportion: Double; lXProportion, lYProportion: Double;
lMode: TLayoutAdjustmentPolicy; lMode: TLayoutAdjustmentPolicy;
@ -4023,11 +4023,11 @@ begin
end end
else if lMode = lapAutoAdjustForDPI then else if lMode = lapAutoAdjustForDPI then
begin begin
if AFromDPI > 0 then lXProportion := AToDPI / AFromDPI; if AFromPPI > 0 then lXProportion := AToPPI / AFromPPI;
end; end;
// y-axis adjustment proportion // y-axis adjustment proportion
if AFromDPI > 0 then lYProportion := AToDPI / AFromDPI if AFromPPI > 0 then lYProportion := AToPPI / AFromPPI
else lYProportion := 1.0; else lYProportion := 1.0;
DoAutoAdjustLayout(lMode, lXProportion, lYProportion); DoAutoAdjustLayout(lMode, lXProportion, lYProportion);

4
lcl/include/customdesigncontrol.inc
View File

@ -21,11 +21,11 @@ begin
end; end;
procedure TCustomDesignControl.AutoAdjustLayout(AMode: TLayoutAdjustmentPolicy; procedure TCustomDesignControl.AutoAdjustLayout(AMode: TLayoutAdjustmentPolicy;
const AFromDPI, AToDPI, AOldFormWidth, ANewFormWidth: Integer); const AFromPPI, AToPPI, AOldFormWidth, ANewFormWidth: Integer);
begin begin
inherited; inherited;
FPixelsPerInch := AToDPI; FPixelsPerInch := AToPPI;
end; end;
procedure TCustomDesignControl.Loaded; procedure TCustomDesignControl.Loaded;

4
lcl/include/wincontrol.inc
View File

@ -3836,12 +3836,12 @@ begin
end; end;
procedure TWinControl.AutoAdjustLayout(AMode: TLayoutAdjustmentPolicy; procedure TWinControl.AutoAdjustLayout(AMode: TLayoutAdjustmentPolicy;
const AFromDPI, AToDPI, AOldFormWidth, ANewFormWidth: Integer); const AFromPPI, AToPPI, AOldFormWidth, ANewFormWidth: Integer);
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); Controls[i].AutoAdjustLayout(AMode, AFromPPI, AToPPI, AOldFormWidth, ANewFormWidth);
inherited; inherited;
end; end;