From eeff7db7c349a136ac8c52a2ef9e60c98806659f Mon Sep 17 00:00:00 2001
From: ondrej <ondrej@lazarus-ide.org>
Date: Tue, 21 Feb 2017 10:56:42 +0000
Subject: [PATCH] LCL: rename DPI parameters to PPI

git-svn-id: trunk@54218 -
---
 lcl/controls.pp                     | 6 +++---
 lcl/forms.pp                        | 4 ++--
 lcl/include/control.inc             | 6 +++---
 lcl/include/customdesigncontrol.inc | 4 ++--
 lcl/include/wincontrol.inc          | 4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/lcl/controls.pp b/lcl/controls.pp
index b76b34f213..77f4e3f924 100644
--- a/lcl/controls.pp
+++ b/lcl/controls.pp
@@ -1540,7 +1540,7 @@ type
   public
     // LCL Scaling (High-DPI)
     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 FixDesignFontsPPI(const ADesignTimePPI: Integer); virtual;
     procedure ScaleFontsPPI(const AProportion: Double); virtual;
@@ -2214,8 +2214,8 @@ type
     procedure ScrollBy_WS(DeltaX, DeltaY: Integer);
     procedure ScrollBy(DeltaX, DeltaY: Integer); virtual;
     procedure WriteLayoutDebugReport(const Prefix: string); override;
-    procedure AutoAdjustLayout(AMode: TLayoutAdjustmentPolicy; const AFromDPI,
-      AToDPI, AOldFormWidth, ANewFormWidth: Integer); override;
+    procedure AutoAdjustLayout(AMode: TLayoutAdjustmentPolicy; const AFromPPI,
+      AToPPI, AOldFormWidth, ANewFormWidth: Integer); override;
   public
     constructor Create(TheOwner: TComponent);override;
     constructor CreateParented(AParentWindow: HWND);
diff --git a/lcl/forms.pp b/lcl/forms.pp
index 4815a0ef29..0767779913 100644
--- a/lcl/forms.pp
+++ b/lcl/forms.pp
@@ -265,8 +265,8 @@ type
   protected
     procedure SetScaled(const AScaled: Boolean); virtual;
 
-    procedure AutoAdjustLayout(AMode: TLayoutAdjustmentPolicy; const AFromDPI,
-      AToDPI, AOldFormWidth, ANewFormWidth: Integer); override;
+    procedure AutoAdjustLayout(AMode: TLayoutAdjustmentPolicy; const AFromPPI,
+      AToPPI, AOldFormWidth, ANewFormWidth: Integer); override;
     procedure Loaded; override;
   public
     constructor Create(TheOwner: TComponent); override;
diff --git a/lcl/include/control.inc b/lcl/include/control.inc
index 1373a55774..1bbca936ff 100644
--- a/lcl/include/control.inc
+++ b/lcl/include/control.inc
@@ -4006,7 +4006,7 @@ begin
 end;
 
 procedure TControl.AutoAdjustLayout(AMode: TLayoutAdjustmentPolicy;
-  const AFromDPI, AToDPI, AOldFormWidth, ANewFormWidth: Integer);
+  const AFromPPI, AToPPI, AOldFormWidth, ANewFormWidth: Integer);
 var
   lXProportion, lYProportion: Double;
   lMode: TLayoutAdjustmentPolicy;
@@ -4023,11 +4023,11 @@ begin
   end
   else if lMode = lapAutoAdjustForDPI then
   begin
-    if AFromDPI > 0 then lXProportion := AToDPI / AFromDPI;
+    if AFromPPI > 0 then lXProportion := AToPPI / AFromPPI;
   end;
 
   // y-axis adjustment proportion
-  if AFromDPI > 0 then lYProportion := AToDPI / AFromDPI
+  if AFromPPI > 0 then lYProportion := AToPPI / AFromPPI
   else lYProportion := 1.0;
 
   DoAutoAdjustLayout(lMode, lXProportion, lYProportion);
diff --git a/lcl/include/customdesigncontrol.inc b/lcl/include/customdesigncontrol.inc
index b8abbc6e44..99c619b7f1 100644
--- a/lcl/include/customdesigncontrol.inc
+++ b/lcl/include/customdesigncontrol.inc
@@ -21,11 +21,11 @@ begin
 end;
 
 procedure TCustomDesignControl.AutoAdjustLayout(AMode: TLayoutAdjustmentPolicy;
-  const AFromDPI, AToDPI, AOldFormWidth, ANewFormWidth: Integer);
+  const AFromPPI, AToPPI, AOldFormWidth, ANewFormWidth: Integer);
 begin
   inherited;
 
-  FPixelsPerInch := AToDPI;
+  FPixelsPerInch := AToPPI;
 end;
 
 procedure TCustomDesignControl.Loaded;
diff --git a/lcl/include/wincontrol.inc b/lcl/include/wincontrol.inc
index 55ad5095f5..44c4471226 100644
--- a/lcl/include/wincontrol.inc
+++ b/lcl/include/wincontrol.inc
@@ -3836,12 +3836,12 @@ begin
 end;
 
 procedure TWinControl.AutoAdjustLayout(AMode: TLayoutAdjustmentPolicy;
-  const AFromDPI, AToDPI, AOldFormWidth, ANewFormWidth: Integer);
+  const AFromPPI, AToPPI, AOldFormWidth, ANewFormWidth: Integer);
 var
   i: Integer;
 begin
   for i:=0 to ControlCount-1 do
-    Controls[i].AutoAdjustLayout(AMode, AFromDPI, AToDPI, AOldFormWidth, ANewFormWidth);
+    Controls[i].AutoAdjustLayout(AMode, AFromPPI, AToPPI, AOldFormWidth, ANewFormWidth);
 
   inherited;
 end;