From d5d6a6fae946be58ddeeec651bf765bd5ecf39eb Mon Sep 17 00:00:00 2001
From: alexs75 <alexs75@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Mon, 12 Nov 2018 09:56:06 +0000
Subject: [PATCH] RxFPC:try to fix scaling forms in TRxIniPropStorage

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6725 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 components/rx/trunk/rx.inc                    |  2 +-
 .../rx/trunk/rxcontrols/rxinipropstorage.pas  | 30 +++++++++++++++++--
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/components/rx/trunk/rx.inc b/components/rx/trunk/rx.inc
index 2c33772b8..8cff538bc 100644
--- a/components/rx/trunk/rx.inc
+++ b/components/rx/trunk/rx.inc
@@ -60,4 +60,4 @@
 {.$DEFINE OLD_fpSPREADSHEET}
 
 {.$DEFINE DEVELOPER_RX}
-{$DEFINE FIX_WIDTH_WIDE_STRING96}
+{.$DEFINE FIX_WIDTH_WIDE_STRING96}
diff --git a/components/rx/trunk/rxcontrols/rxinipropstorage.pas b/components/rx/trunk/rxcontrols/rxinipropstorage.pas
index d5e130a41..4b42ce060 100644
--- a/components/rx/trunk/rxcontrols/rxinipropstorage.pas
+++ b/components/rx/trunk/rxcontrols/rxinipropstorage.pas
@@ -48,6 +48,7 @@ type
   protected
     function GetIniFileName: string; override;
     procedure FinishPropertyList(List: TStrings); override;
+    function DoReadString(const Section, Ident, DefaultValue: string): string; override;
   public
     procedure StorageNeeded(ReadOnly: Boolean); override;
     { Public declarations }
@@ -56,7 +57,7 @@ type
   end;
 
 implementation
-uses rxapputils, LazUTF8, FileUtil, LazFileUtils, IniFiles, StrUtils;
+uses rxapputils, LazUTF8, FileUtil, LazFileUtils, IniFiles, StrUtils, LCLType;
 
 { TRxIniPropStorage }
 
@@ -83,7 +84,7 @@ begin
 end;
 
 procedure TRxIniPropStorage.FinishPropertyList(List: TStrings);
-{$IFDEF FIX_WIDTH_WIDE_STRING96}
+{$IfDef FIX_WIDTH_WIDE_STRING96}
 var
   S: String;
   i: Integer;
@@ -105,6 +106,31 @@ begin
   inherited FinishPropertyList(List);
 end;
 
+function TRxIniPropStorage.DoReadString(const Section, Ident,
+  DefaultValue: string): string;
+var
+  S: String;
+  ASize: LongInt;
+  ASize1: Integer;
+begin
+  Result := inherited DoReadString(Section, Ident, DefaultValue);
+  {$IfNDef FIX_WIDTH_WIDE_STRING96}
+  S:=UpperCase(Ident);
+  if (Pos('WIDTH', S) > 0) or (Pos('HEIGHT', S) > 0) then
+  begin
+    if Assigned(Screen) then
+    begin
+      ASize:=StrToIntDef(Result, -1);
+      if ASize>-1 then
+      begin
+        ASize1 := MulDiv(ASize, Screen.PixelsPerInch, 96);
+        Result := IntToStr(ASize1);
+      end;
+    end;
+  end;
+  {$EndIf}
+end;
+
 procedure TRxIniPropStorage.StorageNeeded(ReadOnly: Boolean);
 var
   F: Boolean;