Merge pull request #4720 from Arlodotexe/fix/imagecropper-aspect-rati…

…o-not-updating-on-image-load Fixed ImageCropper AspectRatio not updating on image load
CommunityToolkit · Sep 29, 2022 · 0249f73 · 0249f73
2 parents bdcfa43 + 4ea8826
commit 0249f73
Show file tree

Hide file tree

Showing 4 changed files with 196 additions and 105 deletions.
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropper.Events.cs b/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,8 +184,16 @@ private void ImageCanvas_SizeChanged(object sender, SizeChangedEventArgs e)
                 return;
             }
 
-            UpdateImageLayout();
-            UpdateMaskArea();
+            if (TryUpdateImageLayout())
+            {
+                UpdateSelectionThumbs();
+            }
+
+            if (TryUpdateAspectRatio())
+            {
+                UpdateSelectionThumbs();
+                UpdateMaskArea();
+            }
         }
     }
 }