Convert SKRect to CGRect correctly (#2243)

mono · Sep 8, 2022 · 193b587 · 193b587
1 parent aeefa65
commit 193b587
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 2 deletions.
diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.Apple/AppleExtensions.cs b/source/SkiaSharp.Views/SkiaSharp.Views.Apple/AppleExtensions.cs
@@ -45,7 +45,7 @@ public static SKRect ToSKRect(this CGRect rect)
 
 		public static CGRect ToRect(this SKRect rect)
 		{
-			return new CGRect(rect.Left, rect.Top, rect.Right, rect.Bottom);
+			return new CGRect(rect.Left, rect.Top, rect.Width, rect.Height);
 		}
 
 		// CGSize

diff --git a/tests/SkiaSharp.iOS.Tests/iOSExtensionsTests.cs b/tests/SkiaSharp.iOS.Tests/iOSExtensionsTests.cs
@@ -1,4 +1,6 @@
-using Xunit;
+using CoreGraphics;
+using Foundation;
+using Xunit;
 
 namespace SkiaSharp.Views.iOS.Tests
 {
@@ -63,5 +65,39 @@ public void EncodedDataBackedImageToUIImage(byte alpha)
 
 			ValidateTestBitmap(uiImage, alpha);
 		}
+
+		[SkippableTheory]
+		[InlineData(0, 0, 0, 0)]
+		[InlineData(5, 5, 5, 5)]
+		[InlineData(1, 2, 3, 4)]
+		[InlineData(1, 1, 0, 0)]
+		[InlineData(0, 0, 1, 1)]
+		[InlineData(100, 100, 100, 100)]
+		public void SKRectToCGRect(int x, int y, int w, int h)
+		{
+			var initial = SKRect.Create(x, y, w, h);
+			var expected = new CGRect(x, y, w, h);
+
+			var actual = initial.ToRect();
+
+			Assert.Equal(expected, actual);
+		}
+
+		[SkippableTheory]
+		[InlineData(0, 0, 0, 0)]
+		[InlineData(5, 5, 5, 5)]
+		[InlineData(1, 2, 3, 4)]
+		[InlineData(1, 1, 0, 0)]
+		[InlineData(0, 0, 1, 1)]
+		[InlineData(100, 100, 100, 100)]
+		public void CGRectToSKRect(int x, int y, int w, int h)
+		{
+			var initial = new CGRect(x, y, w, h);
+			var expected = SKRect.Create(x, y, w, h);
+
+			var actual = initial.ToSKRect();
+
+			Assert.Equal(expected, actual);
+		}
 	}
 }