Fix tests by applying new code only to Mac Catalyst and not iOS

dotnet · Dec 17, 2024 · 1650bee · 1650bee
1 parent d68d6a9
commit 1650bee
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/src/Core/src/Handlers/Window/WindowHandler.iOS.cs b/src/Core/src/Handlers/Window/WindowHandler.iOS.cs
@@ -12,20 +12,20 @@ protected override void ConnectHandler(UIWindow platformView)
 		{
 			base.ConnectHandler(platformView);
 
-			// For newer iOS versions, we want to wait until we get effective window dimensions from the platform.
-			if (!OperatingSystem.IsIOSVersionAtLeast(16))
+			// For newer Mac Catalyst versions, we want to wait until we get effective window dimensions from the platform.
+			if (OperatingSystem.IsMacCatalyst() && OperatingSystem.IsIOSVersionAtLeast(16))
 			{
-				UpdateVirtualViewFrame(platformView);
+				_proxy.Connect(VirtualView, platformView);
 			} 
 			else 
 			{
-				_proxy.Connect(VirtualView, platformView);
+				UpdateVirtualViewFrame(platformView);
 			}
 		}
 
 		protected override void DisconnectHandler(UIWindow platformView)
 		{
-			if (OperatingSystem.IsIOSVersionAtLeast(16)) 
+			if (OperatingSystem.IsMacCatalyst() && OperatingSystem.IsIOSVersionAtLeast(16)) 
 			{
 				_proxy.Disconnect();
 			}

diff --git a/src/Core/src/Hosting/LifecycleEvents/AppHostBuilderExtensions.iOS.cs b/src/Core/src/Hosting/LifecycleEvents/AppHostBuilderExtensions.iOS.cs
@@ -112,8 +112,8 @@ static void OnConfigureWindow(IiOSLifecycleBuilder iOS)
 			iOS = iOS
 				.WindowSceneDidUpdateCoordinateSpace((windowScene, _, _, _) =>
 				{
-					// iOS 16+ supports effectiveGeometry property on window scenes.
-					if (!OperatingSystem.IsIOSVersionAtLeast(13) || OperatingSystem.IsIOSVersionAtLeast(16))
+					// Mac Catalyst version 16+ supports effectiveGeometry property on window scenes.
+					if (!OperatingSystem.IsIOSVersionAtLeast(13) || (OperatingSystem.IsMacCatalyst() && OperatingSystem.IsIOSVersionAtLeast(16)))
 					{
 						return;
 					}

diff --git a/src/Core/src/Platform/iOS/WindowExtensions.cs b/src/Core/src/Platform/iOS/WindowExtensions.cs
@@ -35,7 +35,7 @@ internal static void UpdateHeight(this UIWindow platformWindow, IWindow window)
 
 		internal static void UpdateCoordinates(this UIWindow platformWindow, IWindow window)
 		{
-			if (OperatingSystem.IsIOSVersionAtLeast(16) && platformWindow.WindowScene is {} windowScene)
+			if (OperatingSystem.IsMacCatalyst() && OperatingSystem.IsIOSVersionAtLeast(16) && platformWindow.WindowScene is {} windowScene)
 			{
 				if (double.IsNaN(window.X) || double.IsNaN(window.Y) || double.IsNaN(window.Width) || double.IsNaN(window.Height)) 
 				{
@@ -52,8 +52,7 @@ internal static void UpdateCoordinates(this UIWindow platformWindow, IWindow win
 			}
 			else
 			{
-				var rectangle = platformWindow.Bounds.ToRectangle();
-				window.FrameChanged(rectangle);
+				window.FrameChanged(platformWindow.Bounds.ToRectangle());
 			}
 		}