New SizeExtensions for Windows.Foundation.Size (#3489)

msftbot[bot] · web-flow · commit 05d77c40e262 · 2020-09-24T18:19:41.000Z
## Closes #3317   ## PR Type What kind of change does this PR introduce?   - Feature       ## What is the new behavior?  This PR adds new extensions to easily convert `Windows.Foundation.Size` and `Point` values to `Rect`: ```csharp namespace Microsoft.Toolkit.Uwp.Extensions { public static class SizeExtensions { public static Rect ToRect(this Size size); public static Rect ToRect(this Size size, double x, double y); public static Rect ToRect(this Size size, Point point); } public static class PointExtensions { public static Rect ToRect(this Point point, double width, double height); public static Rect ToRect(this Point point, Point end); public static Rect ToRect(this Point point, Size size); } } ``` ## PR Checklist Please check if your PR fulfills the following requirements: - [X] Tested code with current [supported SDKs](../readme.md#supported) - [ ] ~~Pull Request has been submitted to the documentation repository [instructions](..\contributing.md#docs). Link: ~~ - [ ] ~~Sample in sample app has been added / updated (for bug fixes / features)~~ - [ ] ~~Icon has been created (if new sample) following the [Thumbnail Style Guide and templates](https://github.com/windows-toolkit/WindowsCommunityToolkit-design-assets)~~ - [X] Tests for the changes have been added (for bug fixes / features) (if applicable) - [X] Header has been added to all new source files (run *build/UpdateHeaders.bat*) - [X] Contains **NO** breaking changes
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Render/MarkdownTable.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Render/MarkdownTable.cs
@@ -155,10 +155,7 @@ protected override Size ArrangeOverride(Size finalSize)
                 var columnIndex = Grid.GetColumn(child);
                 var rowIndex = Grid.GetRow(child);
 
-                var rect = new Rect(0, 0, 0, 0)
-                {
-                    X = _borderThickness
-                };
+                var rect = new Rect(_borderThickness, 0, 0, 0);
 
                 for (int col = 0; col < columnIndex; col++)
                 {
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/Eyedropper/Eyedropper.Logic.cs b/Microsoft.Toolkit.Uwp.UI.Controls/Eyedropper/Eyedropper.Logic.cs
@@ -6,6 +6,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.Graphics.Canvas;
+using Microsoft.Toolkit.Uwp.Extensions;
 using Windows.Foundation;
 using Windows.Graphics.DirectX;
 using Windows.Graphics.Display;
@@ -98,7 +99,7 @@ private void UpdatePreview(int centerX, int centerY)
                     for (var j = colorStartX; j < colorEndX; j++)
                     {
                         var color = colors[((i - colorStartY) * width) + (j - colorStartX)];
-                        drawingSession.FillRectangle(new Rect(startPoint, size), color);
+                        drawingSession.FillRectangle(startPoint.ToRect(size), color);
                         startPoint.X += PreviewPixelsPerRawPixel;
                     }
 
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Eyedropper/EyedropperToolButton.cs b/Microsoft.Toolkit.Uwp.UI.Controls/Eyedropper/EyedropperToolButton.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Threading.Tasks;
+using Microsoft.Toolkit.Uwp.Extensions;
 using Windows.Foundation;
 using Windows.UI.Core;
 using Windows.UI.Xaml;
@@ -216,8 +217,8 @@ private async Task UpdateEyedropperWorkAreaAsync()
                 }
 
                 var transform = TargetElement.TransformToVisual(content);
-                var position = transform.TransformPoint(default(Point));
-                _eyedropper.WorkArea = new Rect(position, new Size(TargetElement.ActualWidth, TargetElement.ActualHeight));
+                var position = transform.TransformPoint(default);
+                _eyedropper.WorkArea = position.ToRect(TargetElement.ActualWidth, TargetElement.ActualHeight);
                 if (ControlHelpers.IsXamlRootAvailable && XamlRoot != null)
                 {
                     _eyedropper.XamlRoot = XamlRoot;
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
@@ -9,6 +9,7 @@
 using Microsoft.Graphics.Canvas;
 using Microsoft.Graphics.Canvas.Effects;
 using Microsoft.Graphics.Canvas.Geometry;
+using Microsoft.Toolkit.Uwp.Extensions;
 using Windows.Foundation;
 using Windows.Graphics.Imaging;
 using Windows.Storage.Streams;
@@ -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.UI.Controls/ImageCropper/ImageCropper.cs b/Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.cs
@@ -4,8 +4,8 @@
 
 using System;
 using System.Threading.Tasks;
+using Microsoft.Toolkit.Uwp.Extensions;
 using Windows.Foundation;
-using Windows.Graphics.Imaging;
 using Windows.Storage;
 using Windows.Storage.Streams;
 using Windows.UI.Xaml;
@@ -120,7 +120,7 @@ private Size MinSelectSize
         {
             get
             {
-                var realMinSelectSize = _imageTransform.TransformBounds(new Rect(default(Point), MinCropSize));
+                var realMinSelectSize = _imageTransform.TransformBounds(MinCropSize.ToRect());
                 var minLength = Math.Min(realMinSelectSize.Width, realMinSelectSize.Height);
                 if (minLength < MinSelectedLength)
                 {
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewPanel.cs b/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewPanel.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.Toolkit.Uwp.Extensions;
 using Microsoft.Toolkit.Uwp.UI.Extensions;
 using Windows.Foundation;
 using Windows.UI.Xaml;
@@ -131,7 +132,7 @@ protected override Size ArrangeOverride(Size finalSize)
                 var y_normalized = (finalSize.Height / 2) - y - (element.DesiredSize.Height / 2);
                 var point = new Point(x_normalized, y_normalized);
 
-                element.Arrange(new Rect(point, element.DesiredSize));
+                element.Arrange(point.ToRect(element.DesiredSize));
 
                 var elementProperties = new OrbitViewElementProperties()
                 {
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RotatorTile/RotatorTile.cs b/Microsoft.Toolkit.Uwp.UI.Controls/RotatorTile/RotatorTile.cs
@@ -5,8 +5,8 @@
 using System;
 using System.Collections;
 using System.Collections.Specialized;
+using Microsoft.Toolkit.Uwp.Extensions;
 using Microsoft.Toolkit.Uwp.Helpers;
-using Windows.Foundation;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Media;
@@ -143,7 +143,7 @@ private void RotatorTile_SizeChanged(object sender, SizeChangedEventArgs e)
             }
 
             // Set clip to control
-            Clip = new RectangleGeometry() { Rect = new Rect(default(Point), e.NewSize) };
+            Clip = new RectangleGeometry { Rect = e.NewSize.ToRect() };
         }
 
         private void RotatorTile_Loaded(object sender, RoutedEventArgs e)
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/UniformGrid/UniformGrid.cs b/Microsoft.Toolkit.Uwp.UI.Controls/UniformGrid/UniformGrid.cs
@@ -152,7 +152,7 @@ protected override Size ArrangeOverride(Size finalSize)
             // Make sure all overflown elements have no size.
             foreach (var child in _overflow)
             {
-                child.Arrange(new Rect(0, 0, 0, 0));
+                child.Arrange(default);
             }
 
             _overflow = new List<UIElement>(); // Reset for next time.
diff --git a/Microsoft.Toolkit.Uwp/Extensions/PointExtensions.cs b/Microsoft.Toolkit.Uwp/Extensions/PointExtensions.cs
@@ -0,0 +1,58 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Diagnostics.Contracts;
+using System.Runtime.CompilerServices;
+using Point = Windows.Foundation.Point;
+using Rect = Windows.Foundation.Rect;
+using Size = Windows.Foundation.Size;
+
+namespace Microsoft.Toolkit.Uwp.Extensions
+{
+    /// <summary>
+    /// Extensions for the <see cref="Point"/> type.
+    /// </summary>
+    public static class PointExtensions
+    {
+        /// <summary>
+        /// Creates a new <see cref="Rect"/> of the specified size, starting at a given point.
+        /// </summary>
+        /// <param name="point">The input <see cref="Point"/> value to convert.</param>
+        /// <param name="width">The width of the rectangle.</param>
+        /// <param name="height">The height of the rectangle.</param>
+        /// <returns>A <see cref="Rect"/> value of the specified size, starting at the given point.</returns>
+        [Pure]
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        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>
+        /// <param name="point">The input <see cref="Point"/> value to convert.</param>
+        /// <param name="size">The size of the rectangle to create.</param>
+        /// <returns>A <see cref="Rect"/> value of the specified size, starting at the given coordinates.</returns>
+        [Pure]
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static Rect ToRect(this Point point, Size size)
+        {
+            return new Rect(point, size);
+        }
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp/Extensions/SizeExtensions.cs b/Microsoft.Toolkit.Uwp/Extensions/SizeExtensions.cs
@@ -0,0 +1,57 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Diagnostics.Contracts;
+using System.Runtime.CompilerServices;
+using Point = Windows.Foundation.Point;
+using Rect = Windows.Foundation.Rect;
+using Size = Windows.Foundation.Size;
+
+namespace Microsoft.Toolkit.Uwp.Extensions
+{
+    /// <summary>
+    /// Extensions for the <see cref="Size"/> type.
+    /// </summary>
+    public static class SizeExtensions
+    {
+        /// <summary>
+        /// Creates a new <see cref="Rect"/> of the specified size, starting at the origin.
+        /// </summary>
+        /// <param name="size">The input <see cref="Size"/> value to convert.</param>
+        /// <returns>A <see cref="Rect"/> value of the specified size, starting at the origin.</returns>
+        [Pure]
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static Rect ToRect(this Size size)
+        {
+            return new Rect(0, 0, size.Width, size.Height);
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="Rect"/> of the specified size, starting at the given coordinates.
+        /// </summary>
+        /// <param name="size">The input <see cref="Size"/> value to convert.</param>
+        /// <param name="x">The horizontal offset.</param>
+        /// <param name="y">The vertical offset.</param>
+        /// <returns>A <see cref="Rect"/> value of the specified size, starting at the given coordinates.</returns>
+        [Pure]
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static Rect ToRect(this Size size, double x, double y)
+        {
+            return new Rect(x, y, size.Width, size.Height);
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="Rect"/> of the specified size, starting at the given position.
+        /// </summary>
+        /// <param name="size">The input <see cref="Size"/> value to convert.</param>
+        /// <param name="point">The starting position to use.</param>
+        /// <returns>A <see cref="Rect"/> value of the specified size, starting at the given position.</returns>
+        [Pure]
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static Rect ToRect(this Size size, Point point)
+        {
+            return new Rect(point, size);
+        }
+    }
+}
diff --git a/UnitTests/UnitTests.UWP/Extensions/Test_PointExtensions.cs b/UnitTests/UnitTests.UWP/Extensions/Test_PointExtensions.cs
diff --git a/UnitTests/UnitTests.UWP/Extensions/Test_SizeExtensions.cs b/UnitTests/UnitTests.UWP/Extensions/Test_SizeExtensions.cs
diff --git a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj

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
`@@ -9,6 +9,7 @@`
`9`	`9`	`using Microsoft.Graphics.Canvas;`
`10`	`10`	`using Microsoft.Graphics.Canvas.Effects;`
`11`	`11`	`using Microsoft.Graphics.Canvas.Geometry;`
	`12`	`+using Microsoft.Toolkit.Uwp.Extensions;`
`12`	`13`	`using Windows.Foundation;`
`13`	`14`	`using Windows.Graphics.Imaging;`
`14`	`15`	`using Windows.Storage.Streams;`
`@@ -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>`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@`
`4`	`4`
`5`	`5`	`using System;`
`6`	`6`	`using System.Threading.Tasks;`
	`7`	`+using Microsoft.Toolkit.Uwp.Extensions;`
`7`	`8`	`using Windows.Foundation;`
`8`		`-using Windows.Graphics.Imaging;`
`9`	`9`	`using Windows.Storage;`
`10`	`10`	`using Windows.Storage.Streams;`
`11`	`11`	`using Windows.UI.Xaml;`
`@@ -120,7 +120,7 @@ private Size MinSelectSize`
`120`	`120`	`{`
`121`	`121`	`get`
`122`	`122`	`{`
`123`		`- var realMinSelectSize = _imageTransform.TransformBounds(new Rect(default(Point), MinCropSize));`
	`123`	`+ var realMinSelectSize = _imageTransform.TransformBounds(MinCropSize.ToRect());`
`124`	`124`	`var minLength = Math.Min(realMinSelectSize.Width, realMinSelectSize.Height);`
`125`	`125`	`if (minLength < MinSelectedLength)`
`126`	`126`	`{`