Added missing Point extension

Sergio0694 · Sergio0694 · commit fb6b43c4bf83 · 2020-09-24T16:47:05.000+02:00
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Carousel/CarouselPanel.cs b/Microsoft.Toolkit.Uwp.UI.Controls/Carousel/CarouselPanel.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using Microsoft.Toolkit.Uwp.Extensions;
 using Microsoft.Toolkit.Uwp.UI.Extensions;
 using Windows.Foundation;
 using Windows.UI;
@@ -283,7 +284,7 @@ protected override Size ArrangeOverride(Size finalSize)
             double centerLeft = 0;
             double centerTop = 0;
 
-            Clip = new RectangleGeometry { Rect = new Rect(0, 0, finalSize.Width, finalSize.Height) };
+            Clip = new RectangleGeometry { Rect = finalSize.ToRect() };
 
             for (int i = 0; i < Children.Count; i++)
             {
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.Animations.cs b/Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.Animations.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Generic;
 using System.Numerics;
+using Microsoft.Toolkit.Uwp.Extensions;
 using Windows.Foundation;
 using Windows.UI.Composition;
 using Windows.UI.Xaml;
@@ -117,7 +118,7 @@ private static List<DiscreteObjectKeyFrame> GetRectKeyframes(Rect from, Rect to,
                 rectKeyframes.Add(new DiscreteObjectKeyFrame
                 {
                     KeyTime = KeyTime.FromTimeSpan(time),
-                    Value = new Rect(startPoint, endPoint)
+                    Value = startPoint.ToRect(endPoint)
                 });
             }
 
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.Events.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using Microsoft.Toolkit.Uwp.Extensions;
 using Windows.Foundation;
 using Windows.System;
 using Windows.UI.Core;
@@ -98,7 +99,7 @@ private void ImageCropperThumb_KeyDown(object sender, KeyRoutedEventArgs e)
 
         private void ImageCropperThumb_KeyUp(object sender, KeyRoutedEventArgs e)
         {
-            var selectedRect = new Rect(new Point(_startX, _startY), new Point(_endX, _endY));
+            var selectedRect = new Point(_startX, _startY).ToRect(new Point(_endX, _endY));
             var croppedRect = _inverseImageTransform.TransformBounds(selectedRect);
             if (croppedRect.Width > MinCropSize.Width && croppedRect.Height > MinCropSize.Height)
             {
@@ -111,7 +112,7 @@ private void ImageCropperThumb_KeyUp(object sender, KeyRoutedEventArgs e)
 
         private void ImageCropperThumb_ManipulationCompleted(object sender, ManipulationCompletedRoutedEventArgs e)
         {
-            var selectedRect = new Rect(new Point(_startX, _startY), new Point(_endX, _endY));
+            var selectedRect = new Point(_startX, _startY).ToRect(new Point(_endX, _endY));
             var croppedRect = _inverseImageTransform.TransformBounds(selectedRect);
             if (croppedRect.Width > MinCropSize.Width && croppedRect.Height > MinCropSize.Height)
             {
@@ -155,7 +156,7 @@ private void SourceImage_ManipulationDelta(object sender, ManipulationDeltaRoute
                 offsetY = Math.Max(offsetY, _restrictedSelectRect.Y - _startY);
             }
 
-            var selectedRect = new Rect(new Point(_startX, _startY), new Point(_endX, _endY));
+            var selectedRect = new Point(_startX, _startY).ToRect(new Point(_endX, _endY));
             selectedRect.X += offsetX;
             selectedRect.Y += offsetY;
             var croppedRect = _inverseImageTransform.TransformBounds(selectedRect);
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.Helpers.cs b/Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.Helpers.cs
@@ -14,6 +14,7 @@
 using Windows.Storage.Streams;
 using Windows.UI;
 using Windows.UI.Xaml.Media.Imaging;
+using Microsoft.Toolkit.Uwp.Extensions;
 
 namespace Microsoft.Toolkit.Uwp.UI.Controls
 {
@@ -299,7 +300,7 @@ private static Rect GetSafeRect(Point startPoint, Point endPoint, Size minSize,
                     break;
             }
 
-            return new Rect(startPoint, endPoint);
+            return startPoint.ToRect(endPoint);
         }
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.Logic.cs b/Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.Logic.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Numerics;
+using Microsoft.Toolkit.Uwp.Extensions;
 using Windows.Foundation;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Hosting;
@@ -111,7 +112,7 @@ private void UpdateCroppedRect(ThumbPosition position, Point diffPos)
 
             var startPoint = new Point(_startX, _startY);
             var endPoint = new Point(_endX, _endY);
-            var currentSelectedRect = new Rect(startPoint, endPoint);
+            var currentSelectedRect = startPoint.ToRect(endPoint);
             switch (position)
             {
                 case ThumbPosition.Top:
@@ -251,7 +252,7 @@ private void UpdateCroppedRect(ThumbPosition position, Point diffPos)
 
             var isEffectiveRegion = IsSafePoint(_restrictedSelectRect, startPoint) &&
                                     IsSafePoint(_restrictedSelectRect, endPoint);
-            var selectedRect = new Rect(startPoint, endPoint);
+            var selectedRect = startPoint.ToRect(endPoint);
             if (!isEffectiveRegion)
             {
                 if (!IsCornerThumb(position) && TryGetContainedRect(_restrictedSelectRect, ref selectedRect))
@@ -268,8 +269,7 @@ private void UpdateCroppedRect(ThumbPosition position, Point diffPos)
             selectedRect.Union(CanvasRect);
             if (selectedRect != CanvasRect)
             {
-                var croppedRect = _inverseImageTransform.TransformBounds(
-                    new Rect(startPoint, endPoint));
+                var croppedRect = _inverseImageTransform.TransformBounds(startPoint.ToRect(endPoint));
                 croppedRect.Intersect(_restrictedCropRect);
                 _currentCroppedRect = croppedRect;
                 var viewportRect = GetUniformRect(CanvasRect, selectedRect.Width / selectedRect.Height);
@@ -460,7 +460,7 @@ private void UpdateMaskArea(bool animate = false)
                 case CropShape.Rectangular:
                     if (_innerGeometry is RectangleGeometry rectangleGeometry)
                     {
-                        var to = new Rect(new Point(_startX, _startY), new Point(_endX, _endY));
+                        var to = new Point(_startX, _startY).ToRect(new Point(_endX, _endY));
                         if (animate)
                         {
                             var storyboard = new Storyboard();
diff --git a/Microsoft.Toolkit.Uwp/Extensions/PointExtensions.cs b/Microsoft.Toolkit.Uwp/Extensions/PointExtensions.cs
@@ -29,6 +29,19 @@ public static Rect ToRect(this Point point, double width, double height)
             return new Rect(point.X, point.Y, width, height);
         }
 
+        /// <summary>
+        /// Creates a new <see cref="Rect"/> ending at the specified point, starting at the given coordinates.
+        /// </summary>
+        /// <param name="point">The input <see cref="Point"/> value to convert.</param>
+        /// <param name="end">The ending position for the rectangle.</param>
+        /// <returns>A <see cref="Rect"/> value between the two specified points.</returns>
+        [Pure]
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static Rect ToRect(this Point point, Point end)
+        {
+            return new Rect(point, end);
+        }
+
         /// <summary>
         /// Creates a new <see cref="Rect"/> of the specified size, starting at the given coordinates.
         /// </summary>
diff --git a/UnitTests/UnitTests.UWP/Extensions/Test_PointExtensions.cs b/UnitTests/UnitTests.UWP/Extensions/Test_PointExtensions.cs
@@ -34,6 +34,24 @@ public static void Test_PointExtensions_ToRect_FromWidthHeight(double width, dou
         [DataRow(3.14d, 6.55f, 3838d, 3.24724928d)]
         [DataRow(double.MinValue, double.Epsilon, 22, 0.3248d)]
         public static void Test_PointExtensions_ToRect_FromPoint(double width, double height, int x, int y)
+        {
+            Point
+                p1 = new Point(x, y),
+                p2 = new Point(x + width, y + height);
+            Rect
+                a = p1.ToRect(p2),
+                b = new Rect(p1, p2);
+
+            Assert.AreEqual(a, b);
+        }
+
+        [TestCategory("SizeExtensions")]
+        [TestMethod]
+        [DataRow(0d, 0d, 0, 0)]
+        [DataRow(0d, 0d, 22, 6.89d)]
+        [DataRow(3.14d, 6.55f, 3838d, 3.24724928d)]
+        [DataRow(double.MinValue, double.Epsilon, 22, 0.3248d)]
+        public static void Test_PointExtensions_ToRect_FromSize(double width, double height, int x, int y)
         {
             Point p = new Point(x, y);
             Size s = new Size(width, height);

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`// See the LICENSE file in the project root for more information.`
`4`	`4`
`5`	`5`	`using System;`
	`6`	`+using Microsoft.Toolkit.Uwp.Extensions;`
`6`	`7`	`using Windows.Foundation;`
`7`	`8`	`using Windows.System;`
`8`	`9`	`using Windows.UI.Core;`
`@@ -98,7 +99,7 @@ private void ImageCropperThumb_KeyDown(object sender, KeyRoutedEventArgs e)`
`98`	`99`
`99`	`100`	`private void ImageCropperThumb_KeyUp(object sender, KeyRoutedEventArgs e)`
`100`	`101`	`{`
`101`		`- var selectedRect = new Rect(new Point(_startX, _startY), new Point(_endX, _endY));`
	`102`	`+ var selectedRect = new Point(_startX, _startY).ToRect(new Point(_endX, _endY));`
`102`	`103`	`var croppedRect = _inverseImageTransform.TransformBounds(selectedRect);`
`103`	`104`	`if (croppedRect.Width > MinCropSize.Width && croppedRect.Height > MinCropSize.Height)`
`104`	`105`	`{`
`@@ -111,7 +112,7 @@ private void ImageCropperThumb_KeyUp(object sender, KeyRoutedEventArgs e)`
`111`	`112`
`112`	`113`	`private void ImageCropperThumb_ManipulationCompleted(object sender, ManipulationCompletedRoutedEventArgs e)`
`113`	`114`	`{`
`114`		`- var selectedRect = new Rect(new Point(_startX, _startY), new Point(_endX, _endY));`
	`115`	`+ var selectedRect = new Point(_startX, _startY).ToRect(new Point(_endX, _endY));`
`115`	`116`	`var croppedRect = _inverseImageTransform.TransformBounds(selectedRect);`
`116`	`117`	`if (croppedRect.Width > MinCropSize.Width && croppedRect.Height > MinCropSize.Height)`
`117`	`118`	`{`
`@@ -155,7 +156,7 @@ private void SourceImage_ManipulationDelta(object sender, ManipulationDeltaRoute`
`155`	`156`	`offsetY = Math.Max(offsetY, _restrictedSelectRect.Y - _startY);`
`156`	`157`	`}`
`157`	`158`
`158`		`- var selectedRect = new Rect(new Point(_startX, _startY), new Point(_endX, _endY));`
	`159`	`+ var selectedRect = new Point(_startX, _startY).ToRect(new Point(_endX, _endY));`
`159`	`160`	`selectedRect.X += offsetX;`
`160`	`161`	`selectedRect.Y += offsetY;`
`161`	`162`	`var croppedRect = _inverseImageTransform.TransformBounds(selectedRect);`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`using Windows.Storage.Streams;`
`15`	`15`	`using Windows.UI;`
`16`	`16`	`using Windows.UI.Xaml.Media.Imaging;`
	`17`	`+using Microsoft.Toolkit.Uwp.Extensions;`
`17`	`18`
`18`	`19`	`namespace Microsoft.Toolkit.Uwp.UI.Controls`
`19`	`20`	`{`
`@@ -299,7 +300,7 @@ private static Rect GetSafeRect(Point startPoint, Point endPoint, Size minSize,`
`299`	`300`	`break;`
`300`	`301`	`}`
`301`	`302`
`302`		`- return new Rect(startPoint, endPoint);`
	`303`	`+ return startPoint.ToRect(endPoint);`
`303`	`304`	`}`
`304`	`305`
`305`	`306`	`/// <summary>`