Extracted UpdateImageLayout call from UpdateAspectRatio

Author: Arlodotexe

Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropper.Events.cs

@@ -173,7 +173,11 @@ private void ImageCanvas_SizeChanged(object sender, SizeChangedEventArgs e)
 
             UpdateImageLayout();
             UpdateMaskArea();
-            UpdateAspectRatio();
+
+            if (TryUpdateAspectRatio())
+            {
+                UpdateImageLayout();
+            }
         }
     }
 }

Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropper.Logic.cs

@@ -36,15 +36,13 @@ private void InitImageLayout(bool animate = false)
             UpdateThumbsVisibility();
         }
 
-        private bool ShouldUpdateImageLayout => Source != null && IsValidRect(CanvasRect);
-
         /// <summary>
         /// Update image source transform.
         /// </summary>
         /// <param name="animate">Whether animation is enabled.</param>
         private void UpdateImageLayout(bool animate = false)
         {
-            if (ShouldUpdateImageLayout)
+            if (Source != null && IsValidRect(CanvasRect))
             {
                 var uniformSelectedRect = GetUniformRect(CanvasRect, _currentCroppedRect.Width / _currentCroppedRect.Height);
                 UpdateImageLayoutWithViewport(uniformSelectedRect, _currentCroppedRect, animate);
@@ -506,16 +504,14 @@ private void UpdateMaskArea(bool animate = false)
             };
         }
 
-        private bool ShouldUpdateAspectRatio => KeepAspectRatio && Source != null && IsValidRect(_restrictedSelectRect);
-
         /// <summary>
         /// Update image aspect ratio.
         /// </summary>
-        private void UpdateAspectRatio(bool animate = false)
+        private bool TryUpdateAspectRatio()
         {
-            if (!ShouldUpdateAspectRatio)
+            if (!(KeepAspectRatio && Source != null && IsValidRect(_restrictedSelectRect)))
             {
-                return;
+                return false;
             }
 
             var center = SelectionAreaCenter;
@@ -542,7 +538,7 @@ private void UpdateAspectRatio(bool animate = false)
                 {
                     // Sentinal value. Equivelant to setting KeepAspectRatio to false. Causes AspectRatio to be recalculated.
                     AspectRatio = -1;
-                    return;
+                    return false;
                 }
             }
 
@@ -573,7 +569,7 @@ private void UpdateAspectRatio(bool animate = false)
             croppedRect.Intersect(_restrictedCropRect);
             _currentCroppedRect = croppedRect;
 
-            UpdateImageLayout(animate);
+            return true;
         }
 
         /// <summary>

Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropper.Properties.cs

@@ -51,7 +51,11 @@ private static void OnAspectRatioChanged(
             DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
             var target = (ImageCropper)d;
-            target.UpdateAspectRatio(true);
+
+            if (target.TryUpdateAspectRatio())
+            {
+                target.UpdateImageLayout(true);
+            }
         }
 
         private static void OnCropShapeChanged(
@@ -60,7 +64,12 @@ private static void OnCropShapeChanged(
             var target = (ImageCropper)d;
             target.UpdateCropShape();
             target.UpdateThumbsVisibility();
-            target.UpdateAspectRatio();
+
+            if (target.TryUpdateAspectRatio())
+            {
+                target.UpdateImageLayout();
+            }
+
             target.UpdateMaskArea();
         }