New unit: JPL.Rects. Some routines from JPPack moved here

jackdp · Oct 5, 2020 · be6c461 · be6c461
1 parent 9bb268c
commit be6c461
Show file tree

Hide file tree

Showing 22 changed files with 471 additions and 4 deletions.
diff --git a/Base/JPL.Rects.pas b/Base/JPL.Rects.pas
diff --git a/jp.inc b/jp.inc
@@ -5,7 +5,13 @@
   {$IFEND}
 {$ENDIF}
 
+
+{$UNDEF HAS_ADVANCED_TSIZE}
+{$UNDEF HAS_ADVANCED_TRECT}
+{$UNDEF HAS_ADVANCED_TPOINT}
+
 // --------------- Free Pascal -------------------
+
 {$IFDEF FPC}
 
   {$UNDEF HAS_TSTRINGS_WRITEBOM}
@@ -22,6 +28,9 @@
 
   {$DEFINE HAS_FORMATSETTINGS}
 
+  {$DEFINE HAS_ADVANCED_TSIZE}
+  {$DEFINE HAS_ADVANCED_TRECT}
+  {$DEFINE HAS_ADVANCED_TPOINT}
 
   // FPC 3.0.4 and UP
   {$IF DEFINED(FPC_FULLVERSION) and (FPC_FULLVERSION >= 30004)}
@@ -50,8 +59,8 @@
 {$ENDIF} // FPC
 
 
-
 // --------------------- Delphi ----------------------
+
 {$IFDEF DCC}
 
   {$IFDEF VER200}
@@ -126,4 +135,10 @@
     {$DEFINE HAS_STYLE_ELEMENTS}
   {$IFEND}
 
+
+  {$IFDEF DELPHIXE2_OR_ABOVE}
+    {$DEFINE HAS_ADVANCED_TSIZE}
+    {$DEFINE HAS_ADVANCED_TRECT}
+    {$DEFINE HAS_ADVANCED_TPOINT}
+  {$ENDIF}
 {$ENDIF} // DCC
diff --git a/packages/CodeTyphon/jplib.ctpkg b/packages/CodeTyphon/jplib.ctpkg
@@ -176,6 +176,10 @@
         <Filename Value="..\..\Base\JPL.Win.SimpleTimer.pas"/>
         <UnitName Value="JPL.Win.SimpleTimer"/>
       </Item>
+      <Item>
+        <Filename Value="..\..\Base\JPL.Rects.pas"/>
+        <UnitName Value="JPL.Rects"/>
+      </Item>
     </Files>
     <RequiredPkgs>
       <Item>

diff --git a/packages/CodeTyphon/jplib.pas b/packages/CodeTyphon/jplib.pas
@@ -12,7 +12,8 @@ interface
   JPL.FileSearch, JPL.FileSearcher, JPL.IniFile, JPL.JsonHelpers, JPL.LangMgr, JPL.Language, JPL.Math, JPL.MemIniFile, JPL.RTTI, 
   JPL.StrHash, JPL.Strings.Ext, JPL.Strings, JPL.Units, JPL.Utils, JPL.Win.Dialogs, JPL.Win.FileSystem, JPL.Win.Processes, 
   JPL.Win.Shortcuts, JPL.Win.System, JPL.Win.VersionInfo, JPL.StrList, JPL.Win.FileIcons, JPL.ColorArrays, JPL.Colors.ColorClass, 
-  JPL.Colors.List, JPL.Colors, JPL.SimpleLogger, JPL.TimeLogger, JPL.TStr, JPL.TStringsHelper, JPL.Win.SimpleTimer, TyphonPackageIntf;
+  JPL.Colors.List, JPL.Colors, JPL.SimpleLogger, JPL.TimeLogger, JPL.TStr, JPL.TStringsHelper, JPL.Win.SimpleTimer, JPL.Rects, 
+  TyphonPackageIntf;
 
 implementation
 

diff --git a/packages/Delphi_10.0_Seattle/JPLib.dpk b/packages/Delphi_10.0_Seattle/JPLib.dpk
@@ -60,6 +60,7 @@ contains
   JPL.TStr in '..\..\Base\JPL.TStr.pas',
   JPL.Units in '..\..\Base\JPL.Units.pas',
   JPL.Utils in '..\..\Base\JPL.Utils.pas',
+  JPL.Rects in '..\..\Base\JPL.Rects.pas',
   JPL.Win.Dialogs in '..\..\Base\JPL.Win.Dialogs.pas',
   JPL.Win.FileSystem in '..\..\Base\JPL.Win.FileSystem.pas',
   JPL.Win.Processes in '..\..\Base\JPL.Win.Processes.pas',

diff --git a/packages/Delphi_10.1_Berlin/JPLib.dpk b/packages/Delphi_10.1_Berlin/JPLib.dpk
@@ -60,6 +60,7 @@ contains
   JPL.TStr in '..\..\Base\JPL.TStr.pas',
   JPL.Units in '..\..\Base\JPL.Units.pas',
   JPL.Utils in '..\..\Base\JPL.Utils.pas',
+  JPL.Rects in '..\..\Base\JPL.Rects.pas',
   JPL.Win.Dialogs in '..\..\Base\JPL.Win.Dialogs.pas',
   JPL.Win.FileSystem in '..\..\Base\JPL.Win.FileSystem.pas',
   JPL.Win.Processes in '..\..\Base\JPL.Win.Processes.pas',

diff --git a/packages/Delphi_10.2_Tokyo/JPLib.dpk b/packages/Delphi_10.2_Tokyo/JPLib.dpk
@@ -60,6 +60,7 @@ contains
   JPL.TStr in '..\..\Base\JPL.TStr.pas',
   JPL.Units in '..\..\Base\JPL.Units.pas',
   JPL.Utils in '..\..\Base\JPL.Utils.pas',
+  JPL.Rects in '..\..\Base\JPL.Rects.pas',
   JPL.Win.Dialogs in '..\..\Base\JPL.Win.Dialogs.pas',
   JPL.Win.FileSystem in '..\..\Base\JPL.Win.FileSystem.pas',
   JPL.Win.Processes in '..\..\Base\JPL.Win.Processes.pas',

diff --git a/packages/Delphi_10.3_Rio/JPLib.dpk b/packages/Delphi_10.3_Rio/JPLib.dpk
@@ -60,6 +60,7 @@ contains
   JPL.TStr in '..\..\Base\JPL.TStr.pas',
   JPL.Units in '..\..\Base\JPL.Units.pas',
   JPL.Utils in '..\..\Base\JPL.Utils.pas',
+  JPL.Rects in '..\..\Base\JPL.Rects.pas',
   JPL.Win.Dialogs in '..\..\Base\JPL.Win.Dialogs.pas',
   JPL.Win.FileSystem in '..\..\Base\JPL.Win.FileSystem.pas',
   JPL.Win.Processes in '..\..\Base\JPL.Win.Processes.pas',

diff --git a/packages/Delphi_10.4_Sydney/JPLib.dpk b/packages/Delphi_10.4_Sydney/JPLib.dpk
@@ -60,6 +60,7 @@ contains
   JPL.TStr in '..\..\Base\JPL.TStr.pas',
   JPL.Units in '..\..\Base\JPL.Units.pas',
   JPL.Utils in '..\..\Base\JPL.Utils.pas',
+  JPL.Rects in '..\..\Base\JPL.Rects.pas',
   JPL.Win.Dialogs in '..\..\Base\JPL.Win.Dialogs.pas',
   JPL.Win.FileSystem in '..\..\Base\JPL.Win.FileSystem.pas',
   JPL.Win.Processes in '..\..\Base\JPL.Win.Processes.pas',

diff --git a/packages/Delphi_2009/JPLib.dpk b/packages/Delphi_2009/JPLib.dpk
@@ -60,6 +60,7 @@ contains
   JPL.TStr in '..\..\Base\JPL.TStr.pas',
   JPL.Units in '..\..\Base\JPL.Units.pas',
   JPL.Utils in '..\..\Base\JPL.Utils.pas',
+  JPL.Rects in '..\..\Base\JPL.Rects.pas',
   JPL.Win.Dialogs in '..\..\Base\JPL.Win.Dialogs.pas',
   JPL.Win.FileSystem in '..\..\Base\JPL.Win.FileSystem.pas',
   JPL.Win.Processes in '..\..\Base\JPL.Win.Processes.pas',

diff --git a/packages/Delphi_2010/JPLib.dpk b/packages/Delphi_2010/JPLib.dpk
@@ -60,6 +60,7 @@ contains
   JPL.TStr in '..\..\Base\JPL.TStr.pas',
   JPL.Units in '..\..\Base\JPL.Units.pas',
   JPL.Utils in '..\..\Base\JPL.Utils.pas',
+  JPL.Rects in '..\..\Base\JPL.Rects.pas',
   JPL.Win.Dialogs in '..\..\Base\JPL.Win.Dialogs.pas',
   JPL.Win.FileSystem in '..\..\Base\JPL.Win.FileSystem.pas',
   JPL.Win.Processes in '..\..\Base\JPL.Win.Processes.pas',

diff --git a/packages/Delphi_XE/JPLib.dpk b/packages/Delphi_XE/JPLib.dpk
@@ -60,6 +60,7 @@ contains
   JPL.TStr in '..\..\Base\JPL.TStr.pas',
   JPL.Units in '..\..\Base\JPL.Units.pas',
   JPL.Utils in '..\..\Base\JPL.Utils.pas',
+  JPL.Rects in '..\..\Base\JPL.Rects.pas',
   JPL.Win.Dialogs in '..\..\Base\JPL.Win.Dialogs.pas',
   JPL.Win.FileSystem in '..\..\Base\JPL.Win.FileSystem.pas',
   JPL.Win.Processes in '..\..\Base\JPL.Win.Processes.pas',

diff --git a/packages/Delphi_XE2/JPLib.dpk b/packages/Delphi_XE2/JPLib.dpk
@@ -60,6 +60,7 @@ contains
   JPL.TStr in '..\..\Base\JPL.TStr.pas',
   JPL.Units in '..\..\Base\JPL.Units.pas',
   JPL.Utils in '..\..\Base\JPL.Utils.pas',
+  JPL.Rects in '..\..\Base\JPL.Rects.pas',
   JPL.Win.Dialogs in '..\..\Base\JPL.Win.Dialogs.pas',
   JPL.Win.FileSystem in '..\..\Base\JPL.Win.FileSystem.pas',
   JPL.Win.Processes in '..\..\Base\JPL.Win.Processes.pas',

diff --git a/packages/Delphi_XE3/JPLib.dpk b/packages/Delphi_XE3/JPLib.dpk
@@ -60,6 +60,7 @@ contains
   JPL.TStr in '..\..\Base\JPL.TStr.pas',
   JPL.Units in '..\..\Base\JPL.Units.pas',
   JPL.Utils in '..\..\Base\JPL.Utils.pas',
+  JPL.Rects in '..\..\Base\JPL.Rects.pas',
   JPL.Win.Dialogs in '..\..\Base\JPL.Win.Dialogs.pas',
   JPL.Win.FileSystem in '..\..\Base\JPL.Win.FileSystem.pas',
   JPL.Win.Processes in '..\..\Base\JPL.Win.Processes.pas',

diff --git a/packages/Delphi_XE4/JPLib.dpk b/packages/Delphi_XE4/JPLib.dpk
@@ -60,6 +60,7 @@ contains
   JPL.TStr in '..\..\Base\JPL.TStr.pas',
   JPL.Units in '..\..\Base\JPL.Units.pas',
   JPL.Utils in '..\..\Base\JPL.Utils.pas',
+  JPL.Rects in '..\..\Base\JPL.Rects.pas',
   JPL.Win.Dialogs in '..\..\Base\JPL.Win.Dialogs.pas',
   JPL.Win.FileSystem in '..\..\Base\JPL.Win.FileSystem.pas',
   JPL.Win.Processes in '..\..\Base\JPL.Win.Processes.pas',

diff --git a/packages/Delphi_XE5/JPLib.dpk b/packages/Delphi_XE5/JPLib.dpk
@@ -60,6 +60,7 @@ contains
   JPL.TStr in '..\..\Base\JPL.TStr.pas',
   JPL.Units in '..\..\Base\JPL.Units.pas',
   JPL.Utils in '..\..\Base\JPL.Utils.pas',
+  JPL.Rects in '..\..\Base\JPL.Rects.pas',
   JPL.Win.Dialogs in '..\..\Base\JPL.Win.Dialogs.pas',
   JPL.Win.FileSystem in '..\..\Base\JPL.Win.FileSystem.pas',
   JPL.Win.Processes in '..\..\Base\JPL.Win.Processes.pas',

diff --git a/packages/Delphi_XE6/JPLib.dpk b/packages/Delphi_XE6/JPLib.dpk
@@ -60,6 +60,7 @@ contains
   JPL.TStr in '..\..\Base\JPL.TStr.pas',
   JPL.Units in '..\..\Base\JPL.Units.pas',
   JPL.Utils in '..\..\Base\JPL.Utils.pas',
+  JPL.Rects in '..\..\Base\JPL.Rects.pas',
   JPL.Win.Dialogs in '..\..\Base\JPL.Win.Dialogs.pas',
   JPL.Win.FileSystem in '..\..\Base\JPL.Win.FileSystem.pas',
   JPL.Win.Processes in '..\..\Base\JPL.Win.Processes.pas',

diff --git a/packages/Delphi_XE7/JPLib.dpk b/packages/Delphi_XE7/JPLib.dpk
@@ -60,6 +60,7 @@ contains
   JPL.TStr in '..\..\Base\JPL.TStr.pas',
   JPL.Units in '..\..\Base\JPL.Units.pas',
   JPL.Utils in '..\..\Base\JPL.Utils.pas',
+  JPL.Rects in '..\..\Base\JPL.Rects.pas',
   JPL.Win.Dialogs in '..\..\Base\JPL.Win.Dialogs.pas',
   JPL.Win.FileSystem in '..\..\Base\JPL.Win.FileSystem.pas',
   JPL.Win.Processes in '..\..\Base\JPL.Win.Processes.pas',

diff --git a/packages/Delphi_XE8/JPLib.dpk b/packages/Delphi_XE8/JPLib.dpk
@@ -60,6 +60,7 @@ contains
   JPL.TStr in '..\..\Base\JPL.TStr.pas',
   JPL.Units in '..\..\Base\JPL.Units.pas',
   JPL.Utils in '..\..\Base\JPL.Utils.pas',
+  JPL.Rects in '..\..\Base\JPL.Rects.pas',
   JPL.Win.Dialogs in '..\..\Base\JPL.Win.Dialogs.pas',
   JPL.Win.FileSystem in '..\..\Base\JPL.Win.FileSystem.pas',
   JPL.Win.Processes in '..\..\Base\JPL.Win.Processes.pas',

diff --git a/packages/Lazarus/jplib.lpk b/packages/Lazarus/jplib.lpk
@@ -14,7 +14,7 @@
       </SearchPaths>
     </CompilerOptions>
     <Description Value="JPLib"/>
-    <Files Count="39">
+    <Files Count="40">
       <Item1>
         <Filename Value="..\..\Base\JPL.CmdLineParser.pas"/>
         <UnitName Value="JPL.CmdLineParser"/>
@@ -171,6 +171,10 @@
         <Filename Value="..\..\Base\JPL.Win.SimpleTimer.pas"/>
         <UnitName Value="JPL.Win.SimpleTimer"/>
       </Item39>
+      <Item40>
+        <Filename Value="..\..\Base\JPL.Rects.pas"/>
+        <UnitName Value="JPL.Rects"/>
+      </Item40>
     </Files>
     <RequiredPkgs Count="3">
       <Item1>

diff --git a/packages/Lazarus/jplib.pas b/packages/Lazarus/jplib.pas
@@ -12,7 +12,7 @@ interface
   JPL.FileSearch, JPL.FileSearcher, JPL.IniFile, JPL.JsonHelpers, JPL.Language, JPL.Math, JPL.MemIniFile, JPL.RTTI, JPL.StrHash, 
   JPL.Strings.Ext, JPL.Strings, JPL.Units, JPL.Utils, JPL.Win.Dialogs, JPL.Win.FileSystem, JPL.Win.Processes, JPL.Win.Shortcuts, 
   JPL.Win.System, JPL.Win.VersionInfo, JPL.StrList, JPL.Win.FileIcons, JPL.ColorArrays, JPL.Colors.ColorClass, JPL.Colors.List, 
-  JPL.Colors, JPL.SimpleLogger, JPL.TimeLogger, JPL.TStr, JPL.TStringsHelper, JPL.Win.SimpleTimer, LazarusPackageIntf;
+  JPL.Colors, JPL.SimpleLogger, JPL.TimeLogger, JPL.TStr, JPL.TStringsHelper, JPL.Win.SimpleTimer, JPL.Rects, LazarusPackageIntf;
 
 implementation
 

diff --git a/packages/_DpkGen/JPLib_TEMPLATE.dpk b/packages/_DpkGen/JPLib_TEMPLATE.dpk
@@ -60,6 +60,7 @@ contains
   JPL.TStr in '..\..\Base\JPL.TStr.pas',
   JPL.Units in '..\..\Base\JPL.Units.pas',
   JPL.Utils in '..\..\Base\JPL.Utils.pas',
+  JPL.Rects in '..\..\Base\JPL.Rects.pas',
   JPL.Win.Dialogs in '..\..\Base\JPL.Win.Dialogs.pas',
   JPL.Win.FileSystem in '..\..\Base\JPL.Win.FileSystem.pas',
   JPL.Win.Processes in '..\..\Base\JPL.Win.Processes.pas',