! Fixed several minor issues mostly related to range checks.

* Code formating
CWBudde · Jul 20, 2015 · 51c98e0 · 51c98e0
1 parent 0692f6b
commit 51c98e0
Show file tree

Hide file tree

Showing 11 changed files with 511 additions and 235 deletions.
diff --git a/Examples/FMX/Delphi Logo/MainUnit.fmx b/Examples/FMX/Delphi Logo/MainUnit.fmx
@@ -4,12 +4,11 @@ object FmDelphiLogo: TFmDelphiLogo
   Caption = 'Delphi Logo'
   ClientHeight = 174
   ClientWidth = 174
-  Visible = False
-  OnCreate = FormCreate
-  Fill.Kind = bkGradient
+  Fill.Kind = Gradient
   Fill.Gradient.Points = <
     item
       Color = xFFFDF6C8
+      Offset = 0.000000000000000000
     end
     item
       Color = xFFE5A679
@@ -23,44 +22,48 @@ object FmDelphiLogo: TFmDelphiLogo
       Color = xFFF1F1CD
       Offset = 1.000000000000000000
     end>
-  Fill.Gradient.StartPosition.Point = '(0.733153760433197,1)'
-  Fill.Gradient.StopPosition.Point = '(0.266846239566803,2.21595097826821E-8)'
-  StyleLookup = 'backgroundstyle'
+  Fill.Gradient.StartPosition.X = 0.733153760433197000
+  Fill.Gradient.StartPosition.Y = 1.000000000000000000
+  Fill.Gradient.StopPosition.X = 0.266846239566803000
+  Fill.Gradient.StopPosition.Y = 0.000000022159509783
+  FormFactor.Width = 320
+  FormFactor.Height = 480
+  FormFactor.Devices = [Desktop, iPhone, iPad]
+  OnCreate = FormCreate
+  DesignerMasterStyle = 0
   object LayoutFrame: TLayout
-    Align = alClient
-    Width = 174.000000000000000000
-    Height = 174.000000000000000000
+    Align = Client
     HitTest = True
+    Size.Width = 174.000000000000000000
+    Size.Height = 174.000000000000000000
+    Size.PlatformDefault = False
     OnMouseDown = LayoutMouseDown
     OnMouseMove = LayoutMouseMove
     object LayoutDelphiLogo: TLayout
-      Align = alClient
-      Width = 174.000000000000000000
-      Height = 174.000000000000000000
+      Align = Client
+      Size.Width = 174.000000000000000000
+      Size.Height = 174.000000000000000000
+      Size.PlatformDefault = False
       object PathCircle: TPath
-        Align = alClient
-        Width = 174.000000000000000000
-        Height = 174.000000000000000000
-        HitTest = False
-        Fill.Color = xFFE21B22
-        Stroke.Kind = bkNone
-        StrokeThickness = 5.000000000000000000
+        Align = Client
         Data.Path = {
           0E0000000000000000002E430000AE420200000000002E437C0C074302000000
           7C0C074300002E43020000000000AE4200002E43020000000CCE1B4200002E43
           02000000000000007C0C07430200000000000000FFFFAD420200000000000037
           0ACE1B420200000010CE1B42000000B7020000000100AE42000000B702000000
           7D0C0743000000B70200000000002E430CCE1B420200000000002E43FFFFAD42
           0300000000002E430000AE42}
-        WrapMode = pwOriginal
+        Fill.Color = xFFE21B22
+        HitTest = False
+        Size.Width = 174.000000000000000000
+        Size.Height = 174.000000000000000000
+        Size.PlatformDefault = False
+        Stroke.Kind = None
+        Stroke.Thickness = 5.000000000000000000
+        WrapMode = Original
       end
       object PathHalfCircle: TPath
-        Align = alClient
-        Width = 174.000000000000000000
-        Height = 174.000000000000000000
-        HitTest = False
-        Fill.Color = xFFEB6E52
-        Stroke.Kind = bkNone
+        Align = Client
         Data.Path = {
           130000000000000000C08A4100C0B2420200000020736641DDC6B24202000000
           49704041608EB74202000000008040410070BD42020000000080404192D30443
@@ -70,18 +73,21 @@ object FmDelphiLogo: TFmDelphiLogo
           01000000FC6F124300C0B24201000000FC3F084300C0B24201000000F0DF1842
           00C0B24201000000E03FDE4100C0B24201000000E0BF8A4100C0B24203000000
           00C08A4100C0B242}
-        WrapMode = pwOriginal
+        Fill.Color = xFFEB6E52
+        HitTest = False
+        Size.Width = 174.000000000000000000
+        Size.Height = 174.000000000000000000
+        Size.PlatformDefault = False
+        Stroke.Kind = None
+        WrapMode = Original
       end
       object LayoutHelmet: TLayout
-        Align = alClient
-        Width = 174.000000000000000000
-        Height = 174.000000000000000000
+        Align = Client
+        Size.Width = 174.000000000000000000
+        Size.Height = 174.000000000000000000
+        Size.PlatformDefault = False
         object PathSpikes: TPath
-          Align = alClient
-          Width = 174.000000000000000000
-          Height = 174.000000000000000000
-          Fill.Color = claWhite
-          Stroke.Kind = bkNone
+          Align = Client
           Data.Path = {
             28000000000000000070E84200807A41010000006FB7B742FDA54B4201000000
             00F0D642002064420100000000980F4300C0D141030000000070E84200807A41
@@ -99,74 +105,78 @@ object FmDelphiLogo: TFmDelphiLogo
             0000E2410040C1420000000029445142E2E3DE420100000000400942F94FE242
             01000000E7182842F725F74201000000D8B96342E273EA420300000029445142
             E2E3DE42}
-          WrapMode = pwOriginal
+          Fill.Color = claWhite
+          Size.Width = 174.000000000000000000
+          Size.Height = 174.000000000000000000
+          Size.PlatformDefault = False
+          Stroke.Kind = None
+          WrapMode = Original
         end
         object PathBackgroundCircle: TPath
-          Align = alClient
-          Width = 174.000000000000000000
-          Height = 174.000000000000000000
-          HitTest = False
-          Fill.Color = xFFEB6E52
-          Stroke.Kind = bkNone
+          Align = Client
           Data.Path = {
             0E000000000000005BC9FF420000B642020000005DC5FF429D2AE34202000000
             2724DB42ADE2034302000000C5F8AD42AEE003430200000009D38042AFDE0343
             0200000045753842F824E34202000000496D38423BFFB542020000004D653842
             79D388420200000062CD80428664484202000000C5F8AD428A5C484202000000
             CE29DB428C544842020000005ACDFF42D3CD8842020000005CC9FF42DBFEB542
             030000005BC9FF420000B642}
-          WrapMode = pwOriginal
+          Fill.Color = xFFEB6E52
+          HitTest = False
+          Size.Width = 174.000000000000000000
+          Size.Height = 174.000000000000000000
+          Size.PlatformDefault = False
+          Stroke.Kind = None
+          WrapMode = Original
         end
         object PathHelmetCircle: TPath
-          Align = alClient
-          Width = 174.000000000000000000
-          Height = 174.000000000000000000
-          HitTest = False
-          Fill.Color = claWhite
-          Stroke.Kind = bkNone
+          Align = Client
           Data.Path = {
             0F000000000000000080AF4200C05D4202000000AF378842F4255C4202000000
             74724F4208458D420200000069D84D42598DB442020000008DEE4C42CDF4CA42
             02000000FC2E61422044E04202000000004082420010EE420100000000308742
             0080F242010000000000AD420080ED420100000000D0A1420030CF4201000000
             0000E74200708B420200000026E3D9427AC07342020000007969C54253AD5E42
             020000000080AF4200C05D42030000000080AF4200C05D42}
-          WrapMode = pwOriginal
+          Fill.Color = claWhite
+          HitTest = False
+          Size.Width = 174.000000000000000000
+          Size.Height = 174.000000000000000000
+          Size.PlatformDefault = False
+          Stroke.Kind = None
+          WrapMode = Original
         end
         object PathHelmet1: TPath
-          Align = alClient
-          Width = 174.000000000000000000
-          Height = 174.000000000000000000
-          HitTest = False
-          Fill.Color = xFFF3B5A1
-          Stroke.Kind = bkNone
+          Align = Client
           Data.Path = {
             0A000000000000000090F94200C06942010000000080904200C0BD4201000000
             00B097420040D74202000000BC36BD4242D6CE42020000000020044300F0BD42
             020000000020044300F0BD420200000062AD01434F95A542020000000090F942
             00C06942020000000090F94200C06942030000000090F94200C06942}
-          WrapMode = pwOriginal
+          Fill.Color = xFFF3B5A1
+          HitTest = False
+          Size.Width = 174.000000000000000000
+          Size.Height = 174.000000000000000000
+          Size.PlatformDefault = False
+          Stroke.Kind = None
+          WrapMode = Original
         end
         object PathHelmet2: TPath
-          Align = alClient
-          Width = 174.000000000000000000
-          Height = 174.000000000000000000
-          HitTest = False
-          Fill.Color = claWhite
-          Stroke.Kind = bkNone
+          Align = Client
           Data.Path = {
             060000000000000000C0F24200C08542010000000090FC420050B64201000000
             00C09E420070CB420100000000109C4200E0C1420100000000C0F24200C08542
             0300000000C0F24200C08542}
-          WrapMode = pwOriginal
+          Fill.Color = claWhite
+          HitTest = False
+          Size.Width = 174.000000000000000000
+          Size.Height = 174.000000000000000000
+          Size.PlatformDefault = False
+          Stroke.Kind = None
+          WrapMode = Original
         end
         object PathHelmet3: TPath
-          Align = alClient
-          Width = 174.000000000000000000
-          Height = 174.000000000000000000
-          HitTest = False
-          Fill.Color = claWhite
-          Stroke.Kind = bkNone
+          Align = Client
           Data.Path = {
             22000000000000000090AE4200A0D642010000000010B04200F0D94202000000
             0010B04200F0D942020000002C63B742D49AEA420200000000D0BF4200F0FC42
@@ -181,15 +191,16 @@ object FmDelphiLogo: TFmDelphiLogo
             FEB6D5425E2EF64202000000493BCB42A4D0EC42020000000030C2420070E542
             02000000B724B9425C0FDE42020000000080B14200B0D842020000000080B142
             00B0D842010000000090AE4200A0D642030000000090AE4200A0D642}
-          WrapMode = pwOriginal
+          Fill.Color = claWhite
+          HitTest = False
+          Size.Width = 174.000000000000000000
+          Size.Height = 174.000000000000000000
+          Size.PlatformDefault = False
+          Stroke.Kind = None
+          WrapMode = Original
         end
         object PathHelmet4: TPath
-          Align = alClient
-          Width = 174.000000000000000000
-          Height = 174.000000000000000000
-          HitTest = False
-          Fill.Color = xFFEB6E52
-          Stroke.Kind = bkNone
+          Align = Client
           Data.Path = {
             1000000000000000C35B9F42567A72420200000040CB91422D35784202000000
             A81F8542529383420200000086D777422B5D8F4202000000090C53423CEEA642
@@ -198,15 +209,16 @@ object FmDelphiLogo: TFmDelphiLogo
             C37B84422BED8C4202000000AF0D8C42FA38844202000000AA8E9542AC577C42
             02000000C3CB9F4256BA754201000000C35B9F42567A724203000000C35B9F42
             567A7242}
-          WrapMode = pwOriginal
+          Fill.Color = xFFEB6E52
+          HitTest = False
+          Size.Width = 174.000000000000000000
+          Size.Height = 174.000000000000000000
+          Size.PlatformDefault = False
+          Stroke.Kind = None
+          WrapMode = Original
         end
         object PathHelmet5: TPath
-          Align = alClient
-          Width = 174.000000000000000000
-          Height = 174.000000000000000000
-          HitTest = False
-          Fill.Color = xFFE41D24
-          Stroke.Kind = bkNone
+          Align = Client
           Data.Path = {
             110000000000000039B5AB421F0EE94202000000AE92AD42696FE94202000000
             EFA2B942EB4D034302000000EFA2B942EB4D034302000000EFA2B942EB4D0343
@@ -215,15 +227,16 @@ object FmDelphiLogo: TFmDelphiLogo
             BC984B425DDE09430200000017BE6D42FF84F342020000004C61754242F7ED42
             0200000010148142DFACE44202000000B3269E42EB4AE6420200000038B5AB42
             1E0EE9420300000039B5AB421F0EE942}
-          WrapMode = pwOriginal
+          Fill.Color = xFFE41D24
+          HitTest = False
+          Size.Width = 174.000000000000000000
+          Size.Height = 174.000000000000000000
+          Size.PlatformDefault = False
+          Stroke.Kind = None
+          WrapMode = Original
         end
         object PathHelmet6: TPath
-          Align = alClient
-          Width = 174.000000000000000000
-          Height = 174.000000000000000000
-          HitTest = False
-          Fill.Color = xFFEB7152
-          Stroke.Kind = bkNone
+          Align = Client
           Data.Path = {
             1700000000000000C3DB90422B7DEA4202000000F1618A4215C3EA4202000000
             3F7A84423B08EC4202000000C35B82422B1DEF4202000000D3008142B815F142
@@ -234,7 +247,13 @@ object FmDelphiLogo: TFmDelphiLogo
             2BCDEF4202000000311AA4422C9DED42020000009833A34210EFEB4202000000
             C3DBA2422BDDEB42020000008E5C9E4296F2EA4202000000955597424137EA42
             02000000C3DB90422B7DEA4203000000C3DB90422B7DEA42}
-          WrapMode = pwOriginal
+          Fill.Color = xFFEB7152
+          HitTest = False
+          Size.Width = 174.000000000000000000
+          Size.Height = 174.000000000000000000
+          Size.PlatformDefault = False
+          Stroke.Kind = None
+          WrapMode = Original
         end
       end
     end

diff --git a/Examples/FMX/Delphi Logo/MainUnit.pas b/Examples/FMX/Delphi Logo/MainUnit.pas
@@ -5,7 +5,7 @@ interface
 uses
   System.SysUtils, System.Types, System.UITypes, System.Classes,
   FMX.Types, FMX.Controls, FMX.Forms, FMX.Dialogs, FMX.Objects,
-  FMX.Canvas.AggPas,
+  FMX.Canvas.AggPas, {$IF CompilerVersion >= 15} FMX.Graphics, {$ENDIF}
   FMX.Layouts;
 
 type
@@ -91,8 +91,10 @@ procedure TFmDelphiLogo.LayoutMouseMove(Sender: TObject;
 
 procedure TFmDelphiLogo.LayoutScalePaint(Sender: TObject; Canvas: TCanvas;
   const ARect: TRectF);
+(*
 var
   Polygon: TPolygon;
+*)
 begin
 (*
 //  Canvas.ClearRect(RectF(12, 12, 59, 59), TAlphaColorRec.Aqua);