Exracted UpdateSelectionThumbs and UpdateMaskArea out of TryUpdateImageLayout

Author: Arlodotexe

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

@@ -106,7 +106,11 @@ private void ImageCropperThumb_KeyUp(object sender, KeyRoutedEventArgs e)
                 _currentCroppedRect = croppedRect;
             }
 
-            UpdateImageLayout(true);
+            if (TryUpdateImageLayout(true))
+            {
+                UpdateSelectionThumbs(true);
+                UpdateMaskArea(true);
+            }
         }
 
         private void ImageCropperThumb_ManipulationCompleted(object sender, ManipulationCompletedRoutedEventArgs e)
@@ -119,7 +123,11 @@ private void ImageCropperThumb_ManipulationCompleted(object sender, Manipulation
                 _currentCroppedRect = croppedRect;
             }
 
-            UpdateImageLayout(true);
+            if (TryUpdateImageLayout(true))
+            {
+                UpdateSelectionThumbs(true);
+                UpdateMaskArea(true);
+            }
         }
 
         private void ImageCropperThumb_ManipulationDelta(object sender, ManipulationDeltaRoutedEventArgs e)
@@ -161,7 +169,12 @@ private void SourceImage_ManipulationDelta(object sender, ManipulationDeltaRoute
             var croppedRect = _inverseImageTransform.TransformBounds(selectedRect);
             croppedRect.Intersect(_restrictedCropRect);
             _currentCroppedRect = croppedRect;
-            UpdateImageLayout();
+
+            if (TryUpdateImageLayout())
+            {
+                UpdateSelectionThumbs();
+                UpdateMaskArea();
+            }
         }
 
         private void ImageCanvas_SizeChanged(object sender, SizeChangedEventArgs e)
@@ -171,12 +184,21 @@ private void ImageCanvas_SizeChanged(object sender, SizeChangedEventArgs e)
                 return;
             }
 
-            UpdateImageLayout();
+            if (TryUpdateImageLayout())
+            {
+                UpdateSelectionThumbs();
+                UpdateMaskArea();
+            }
+
             UpdateMaskArea();
 
             if (TryUpdateAspectRatio())
             {
-                UpdateImageLayout();
+                if (TryUpdateImageLayout())
+                {
+                    UpdateSelectionThumbs();
+                    UpdateMaskArea();
+                }
             }
         }
     }

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

@@ -30,7 +30,12 @@ private void InitImageLayout(bool animate = false)
                 if (IsValidRect(_restrictedCropRect))
                 {
                     _currentCroppedRect = KeepAspectRatio ? GetUniformRect(_restrictedCropRect, ActualAspectRatio) : _restrictedCropRect;
-                    UpdateImageLayout(animate);
+
+                    if (TryUpdateImageLayout(animate))
+                    {
+                        UpdateSelectionThumbs(animate);
+                        UpdateMaskArea(animate);
+                    }
                 }
             }
 
@@ -41,19 +46,13 @@ private void InitImageLayout(bool animate = false)
         /// Update image source transform.
         /// </summary>
         /// <param name="animate">Whether animation is enabled.</param>
-        private bool UpdateImageLayout(bool animate = false)
+        private bool TryUpdateImageLayout(bool animate = false)
         {
             if (Source != null && IsValidRect(CanvasRect))
             {
                 var uniformSelectedRect = GetUniformRect(CanvasRect, _currentCroppedRect.Width / _currentCroppedRect.Height);
 
-                if (TryUpdateImageLayoutWithViewport(uniformSelectedRect, _currentCroppedRect, animate))
-                {
-                    UpdateSelectionThumbs(animate);
-                    UpdateMaskArea(animate);
-                }
-
-                return true;
+                return TryUpdateImageLayoutWithViewport(uniformSelectedRect, _currentCroppedRect, animate);
             }
 
             return false;

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

@@ -54,7 +54,11 @@ private static void OnAspectRatioChanged(
 
             if (target.TryUpdateAspectRatio())
             {
-                target.UpdateImageLayout(true);
+                if (target.TryUpdateImageLayout(true))
+                {
+                    target.UpdateSelectionThumbs(true);
+                    target.UpdateMaskArea(true);
+                }
             }
         }
 
@@ -67,7 +71,11 @@ private static void OnCropShapeChanged(
 
             if (target.TryUpdateAspectRatio())
             {
-                target.UpdateImageLayout();
+                if (target.TryUpdateImageLayout())
+                {
+                    target.UpdateSelectionThumbs();
+                    target.UpdateMaskArea();
+                }
             }
 
             target.UpdateMaskArea();

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

@@ -455,7 +455,12 @@ public bool TrySetCroppedRegion(Rect rect)
             }
 
             _currentCroppedRect = rect;
-            UpdateImageLayout(true);
+            if (TryUpdateImageLayout(true))
+            {
+                UpdateSelectionThumbs(true);
+                UpdateMaskArea(true);
+            }
+
             return true;
         }
     }