Update ALPaintRectangle, AlPaintCircle

MagicFoundation · Oct 11, 2023 · bad7dde · bad7dde
1 parent 8a73fd5
commit bad7dde
Show file tree

Hide file tree

Showing 15 changed files with 1,510 additions and 449 deletions.
diff --git a/Demos/ALAnimation/_Source/ALAnimationDemo.dproj b/Demos/ALAnimation/_Source/ALAnimationDemo.dproj
@@ -146,7 +146,7 @@
     <Icon_MainIcon>$(BDS)\bin\delphi_PROJECTICON.ico</Icon_MainIcon>
     <Icns_MainIcns>$(BDS)\bin\delphi_PROJECTICNS.icns</Icns_MainIcns>
     <SanitizedProjectName>ALAnimationDemo</SanitizedProjectName>
-    <DCC_UnitSearchPath>..\..\..\Source;..\..\..\Embarcadero\Alexandria\fmx;..\..\..\Embarcadero\Alexandria\rtl\ios;..\..\..\Embarcadero\Alexandria\rtl\android;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+    <DCC_UnitSearchPath>..\..\..\Source;..\..\..\Embarcadero\Alexandria\fmx;..\..\..\Embarcadero\Alexandria\rtl\ios;..\..\..\Embarcadero\Alexandria\rtl\osx;..\..\..\Embarcadero\Alexandria\rtl\android;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
   </PropertyGroup>
   <PropertyGroup Condition="&#39;$(Base_Android)&#39;!=&#39;&#39;">
     <DCC_UsePackage>DBXSqliteDriver;DBXInterBaseDriver;tethering;bindcompfmx;FmxTeeUI;fmx;FireDACDBXDriver;dbexpress;IndyCore;dsnap;DataSnapCommon;bindengine;DataSnapClient;bindcompdbx;IndyIPCommon;IndyIPServer;IndySystem;fmxFireDAC;ibmonitor;FMXTee;DbxCommonDriver;ibxpress;xmlrtl;DataSnapNativeClient;ibxbindings;rtl;FireDACDSDriver;DbxClientDriver;CustomIPTransport;bindcomp;IndyIPClient;dbxcds;dsnapxml;DataSnapProviderClient;dbrtl;IndyProtocols;$(DCC_UsePackage)</DCC_UsePackage>

diff --git a/Demos/ALFacebookLogin/_Source/ALFacebookLogin.dproj b/Demos/ALFacebookLogin/_Source/ALFacebookLogin.dproj
@@ -160,7 +160,7 @@
     <Base>true</Base>
   </PropertyGroup>
   <PropertyGroup Condition="&#39;$(Base)&#39;!=&#39;&#39;">
-    <DCC_UnitSearchPath>..\..\..\Source;..\..\..\Embarcadero\Alexandria\fmx;..\..\..\Embarcadero\Alexandria\rtl\ios;..\..\..\Embarcadero\Alexandria\rtl\android;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+    <DCC_UnitSearchPath>..\..\..\Source;..\..\..\Embarcadero\Alexandria\fmx;..\..\..\Embarcadero\Alexandria\rtl\ios;..\..\..\Embarcadero\Alexandria\rtl\osx;..\..\..\Embarcadero\Alexandria\rtl\android;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
     <DCC_CodePage>65001</DCC_CodePage>
     <Icns_MainIcns>$(BDS)\bin\delphi_PROJECTICNS.icns</Icns_MainIcns>
     <AUP_ACCESS_COARSE_LOCATION>true</AUP_ACCESS_COARSE_LOCATION>

diff --git a/Demos/ALFmxControls/_Source/ALFmxControls.dproj b/Demos/ALFmxControls/_Source/ALFmxControls.dproj
@@ -160,7 +160,7 @@
     <Base>true</Base>
   </PropertyGroup>
   <PropertyGroup Condition="&#39;$(Base)&#39;!=&#39;&#39;">
-    <DCC_UnitSearchPath>..\..\..\Source;..\..\..\Embarcadero\Alexandria\fmx;..\..\..\Embarcadero\Alexandria\rtl\ios;..\..\..\Embarcadero\Alexandria\rtl\android;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+    <DCC_UnitSearchPath>..\..\..\Source;..\..\..\Embarcadero\Alexandria\fmx;..\..\..\Embarcadero\Alexandria\rtl\ios;..\..\..\Embarcadero\Alexandria\rtl\osx;..\..\..\Embarcadero\Alexandria\rtl\android;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
     <Icns_MainIcns>$(BDS)\bin\delphi_PROJECTICNS.icns</Icns_MainIcns>
     <AUP_WRITE_EXTERNAL_STORAGE>true</AUP_WRITE_EXTERNAL_STORAGE>
     <AUP_CALL_PHONE>true</AUP_CALL_PHONE>

diff --git a/Demos/ALFmxFilterEffects/_Source/ALFmxFilterEffectsDemo.dproj b/Demos/ALFmxFilterEffects/_Source/ALFmxFilterEffectsDemo.dproj
@@ -146,7 +146,7 @@
     <Icon_MainIcon>$(BDS)\bin\delphi_PROJECTICON.ico</Icon_MainIcon>
     <Icns_MainIcns>$(BDS)\bin\delphi_PROJECTICNS.icns</Icns_MainIcns>
     <SanitizedProjectName>ALFmxFilterEffectsDemo</SanitizedProjectName>
-    <DCC_UnitSearchPath>..\..\..\Source;..\..\..\Embarcadero\Alexandria\fmx;..\..\..\Embarcadero\Alexandria\rtl\ios;..\..\..\Embarcadero\Alexandria\rtl\android;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+    <DCC_UnitSearchPath>..\..\..\Source;..\..\..\Embarcadero\Alexandria\fmx;..\..\..\Embarcadero\Alexandria\rtl\ios;..\..\..\Embarcadero\Alexandria\rtl\osx;..\..\..\Embarcadero\Alexandria\rtl\android;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
   </PropertyGroup>
   <PropertyGroup Condition="&#39;$(Base_Android)&#39;!=&#39;&#39;">
     <DCC_UsePackage>DBXSqliteDriver;DBXInterBaseDriver;tethering;bindcompfmx;FmxTeeUI;fmx;FireDACDBXDriver;dbexpress;IndyCore;dsnap;DataSnapCommon;bindengine;DataSnapClient;bindcompdbx;IndyIPCommon;IndyIPServer;IndySystem;fmxFireDAC;ibmonitor;FMXTee;DbxCommonDriver;ibxpress;xmlrtl;DataSnapNativeClient;ibxbindings;rtl;FireDACDSDriver;DbxClientDriver;CustomIPTransport;bindcomp;IndyIPClient;dbxcds;dsnapxml;DataSnapProviderClient;dbrtl;IndyProtocols;$(DCC_UsePackage)</DCC_UsePackage>

diff --git a/Demos/ALGeoPositionSensor/_Source/ALGeoPositionSensorDemo.dproj b/Demos/ALGeoPositionSensor/_Source/ALGeoPositionSensorDemo.dproj
@@ -160,7 +160,7 @@
     <Base>true</Base>
   </PropertyGroup>
   <PropertyGroup Condition="&#39;$(Base)&#39;!=&#39;&#39;">
-    <DCC_UnitSearchPath>..\..\..\Source;..\..\..\Embarcadero\Alexandria\fmx;..\..\..\Embarcadero\Alexandria\rtl\ios;..\..\..\Embarcadero\Alexandria\rtl\android;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+    <DCC_UnitSearchPath>..\..\..\Source;..\..\..\Embarcadero\Alexandria\fmx;..\..\..\Embarcadero\Alexandria\rtl\ios;..\..\..\Embarcadero\Alexandria\rtl\osx;..\..\..\Embarcadero\Alexandria\rtl\android;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
     <DCC_CodePage>65001</DCC_CodePage>
     <Icns_MainIcns>$(BDS)\bin\delphi_PROJECTICNS.icns</Icns_MainIcns>
     <AUP_ACCESS_COARSE_LOCATION>true</AUP_ACCESS_COARSE_LOCATION>

diff --git a/Demos/ALLiveVideoChat/Client/_Source/ALLiveVideoChatClient.dproj b/Demos/ALLiveVideoChat/Client/_Source/ALLiveVideoChatClient.dproj
@@ -182,7 +182,7 @@
     <Icon_MainIcon>$(BDS)\bin\delphi_PROJECTICON.ico</Icon_MainIcon>
     <Icns_MainIcns>$(BDS)\bin\delphi_PROJECTICNS.icns</Icns_MainIcns>
     <SanitizedProjectName>ALLiveVideoChatClient</SanitizedProjectName>
-    <DCC_UnitSearchPath>..\..\..\..\Embarcadero\Alexandria\fmx;..\..\..\..\Embarcadero\Alexandria\rtl\ios;..\..\..\..\Embarcadero\Alexandria\rtl\android;..\..\..\..\Source;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+    <DCC_UnitSearchPath>..\..\..\..\Embarcadero\Alexandria\fmx;..\..\..\..\Embarcadero\Alexandria\rtl\ios;..\..\..\Embarcadero\Alexandria\rtl\osx;..\..\..\..\Embarcadero\Alexandria\rtl\android;..\..\..\..\Source;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
     <OrientationPortrait>true</OrientationPortrait>
     <OrientationPortraitUpsideDown>true</OrientationPortraitUpsideDown>
     <DCC_CodePage>65001</DCC_CodePage>

diff --git a/Demos/ALNotificationService/_Source/ALNotificationServiceDemo.dproj b/Demos/ALNotificationService/_Source/ALNotificationServiceDemo.dproj
@@ -182,7 +182,7 @@
     <DCC_S>false</DCC_S>
     <DCC_F>false</DCC_F>
     <DCC_K>false</DCC_K>
-    <DCC_UnitSearchPath>..\..\..\Source;..\..\..\Embarcadero\Alexandria\fmx;..\..\..\Embarcadero\Alexandria\rtl\ios;..\..\..\Embarcadero\Alexandria\rtl\android;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+    <DCC_UnitSearchPath>..\..\..\Source;..\..\..\Embarcadero\Alexandria\fmx;..\..\..\Embarcadero\Alexandria\rtl\ios;..\..\..\Embarcadero\Alexandria\rtl\osx;..\..\..\Embarcadero\Alexandria\rtl\android;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
   </PropertyGroup>
   <PropertyGroup Condition="&#39;$(Base_Android)&#39;!=&#39;&#39;">
     <IncludeAndroid_Splash>False</IncludeAndroid_Splash>

diff --git a/Embarcadero/Alexandria/Alexandria.patch b/Embarcadero/Alexandria/Alexandria.patch
@@ -2164,6 +2164,19 @@ diff --git a/Embarcadero/Alexandria/rtl/ios/iOSapi.Security.pas b/Embarcadero/Al
  {$IF defined(IOS) and NOT defined(CPUARM)}
 
  initialization
+Index: Embarcadero/Alexandria/rtl/ios/iOSapi.UIKit.pas
+===================================================================
+diff --git a/Embarcadero/Alexandria/rtl/ios/iOSapi.UIKit.pas b/Embarcadero/Alexandria/rtl/ios/iOSapi.UIKit.pas
+--- a/Embarcadero/Alexandria/rtl/ios/iOSapi.UIKit.pas	(revision 1)
++++ b/Embarcadero/Alexandria/rtl/ios/iOSapi.UIKit.pas	(working copy)
+@@ -2634,6 +2634,7 @@
+     function nativeBounds: CGRect; cdecl;
+     function nativeScale: CGFloat; cdecl;
+     function snapshotViewAfterScreenUpdates(afterUpdates: Boolean): UIView; cdecl;
++    function maximumFramesPerSecond: NSInteger; cdecl;
+   end;
+   TUIScreen = class(TOCGenericImport<UIScreenClass, UIScreen>)  end;
+
 Index: Embarcadero/Alexandria/rtl/win/Winapi.Isapi2.pas
 ===================================================================
 diff --git a/Embarcadero/Alexandria/rtl/win/Winapi.Isapi2.pas b/Embarcadero/Alexandria/rtl/win/Winapi.Isapi2.pas

diff --git a/Embarcadero/Alexandria/Update.bat b/Embarcadero/Alexandria/Update.bat
@@ -24,6 +24,7 @@ IF EXIST "%FileName%" rmdir /s /q "%FileName%"
 IF EXIST "%FileName%" goto ERROR
 mkdir "%FileName%"
 mkdir "%FileName%\ios"
+mkdir "%FileName%\osx"
 mkdir "%FileName%\android"
 mkdir "%FileName%\win"
 mkdir "%FileName%\net"
@@ -38,6 +39,12 @@ IF EXIST "%EmbSourceDir%\rtl\ios" (
   IF ERRORLEVEL 1 goto ERROR
 )
 
+IF EXIST "%EmbSourceDir%\rtl\osx" (
+  echo Copy "%EmbSourceDir%\rtl\osx"
+  xcopy /Q "%EmbSourceDir%\rtl\osx" "%ALBaseDir%\Embarcadero\Alexandria\rtl\osx"
+  IF ERRORLEVEL 1 goto ERROR
+)
+
 IF EXIST "%EmbSourceDir%\rtl\android" (
   echo Copy "%EmbSourceDir%\rtl\android"
   xcopy /Q "%EmbSourceDir%\rtl\android" "%ALBaseDir%\Embarcadero\Alexandria\rtl\android"

diff --git a/README.md b/README.md
@@ -35,7 +35,7 @@ us to patch the original Delphi source files:
 * [Performance Issue - Comparing Equality Between Two Strings](https://quality.embarcadero.com/browse/RSP-42011)
 * [Introduce IsVisibleObject function for improved optimization on TScrollBox](https://quality.embarcadero.com/browse/RSP-42357)
 * [BeginUpdate/Endupdate block with add or remove of child objects : misconception](https://quality.embarcadero.com/browse/RSP-21013)
-* [The width and height of a TContext3D object must be defined as single-precision floating-point numbers, not as integers](https://quality.embarcadero.com/browse/RSP-41516)
+* [The width and height of a TContext3D object must be defined as single-precision, not as integers](https://quality.embarcadero.com/browse/RSP-41516)
 * [TTextLayout.PositionAtPoint / TTextLayoutD2D.DoPositionAtPoint totally broken in Alexandria](https://quality.embarcadero.com/browse/RSP-39734)
 * [Regression in Alexandria: FMX.StrokeBuilder.pas Revamp Leads to TARC Drawing Issues](https://quality.embarcadero.com/browse/RSP-41618)
 * [GL_TEXTURE_EXTERNAL_OES not supported](https://quality.embarcadero.com/browse/RSP-16830)
@@ -57,6 +57,7 @@ us to patch the original Delphi source files:
 * [Miss CLLocationManager.accuracyAuthorization in iOSapi.CoreLocation.pas](https://quality.embarcadero.com/browse/RSP-41352)
 * [Miss constant kCLLocationAccuracyReduced in iOSapi.CoreLocation.pas](https://quality.embarcadero.com/browse/RSP-41388)
 * [iOS/OSX: Declaration for CLRegion.initCircularRegionWithCenter is incorrect](https://quality.embarcadero.com/browse/RSP-15717)
+* [Missing function declaration for maximumFramesPerSecond in iOSapi.UIKit.UIScreen](https://quality.embarcadero.com/browse/RSP-42455)
 
 
 Install Alcinoe

diff --git a/Source/Alcinoe.FMX.Common.pas b/Source/Alcinoe.FMX.Common.pas
@@ -34,13 +34,13 @@   TALShadow = class(TPersistent)
     fblur: Single;
     fOffsetX: Single;
     fOffsetY: Single;
-    fShadowColor: TAlphaColor;
+    fColor: TAlphaColor;
     FOnChanged: TNotifyEvent;
     procedure SetEnabled(const Value: boolean);
     procedure setblur(const Value: Single);
     procedure setOffsetX(const Value: Single);
     procedure setOffsetY(const Value: Single);
-    procedure setShadowColor(const Value: TAlphaColor);
+    procedure setColor(const Value: TAlphaColor);
     function IsblurStored: Boolean;
     function IsOffsetXStored: Boolean;
     function IsOffsetYStored: Boolean;
@@ -54,7 +54,7 @@   TALShadow = class(TPersistent)
     property blur: Single read fblur write setblur stored IsblurStored;
     property OffsetX: Single read fOffsetX write setOffsetX stored IsOffsetXStored;
     property OffsetY: Single read fOffsetY write setOffsetY stored IsOffsetYStored;
-    property ShadowColor: TAlphaColor read fShadowColor write setShadowColor default $96000000;
+    property Color: TAlphaColor read fColor write setColor default $96000000;
   end;
 
 type
@@ -310,7 +310,7 @@ constructor TALShadow.Create;
   fblur := 12;
   fOffsetX := 0;
   fOffsetY := 0;
-  fShadowColor := $96000000;
+  fColor := $96000000;
   FOnChanged := nil;
 end;
 
@@ -325,7 +325,7 @@ procedure TALShadow.Assign(Source: TPersistent);
     fblur := TALShadow(Source).fblur;
     fOffsetX := TALShadow(Source).fOffsetX;
     fOffsetY := TALShadow(Source).fOffsetY;
-    fShadowColor := TALShadow(Source).fShadowColor;
+    fColor := TALShadow(Source).fColor;
     FOnChanged := LSaveChange;
     if Assigned(FOnChanged) then FOnChanged(Self);
   end
@@ -386,11 +386,11 @@ procedure TALShadow.setOffsetY(const Value: Single);
   end;
 end;
 
-{***********************************************************}
-procedure TALShadow.setShadowColor(const Value: TAlphaColor);
+{*****************************************************}
+procedure TALShadow.setColor(const Value: TAlphaColor);
 begin
-  if FShadowColor <> Value then begin
-    FShadowColor := Value;
+  if FColor <> Value then begin
+    FColor := Value;
     if Assigned(FOnChanged) then FOnChanged(Self);
   end;
 end;