Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed ImageCropper AspectRatio not updating on image load #4720

Merged
merged 16 commits into from
Sep 29, 2022
Merged

Fixed ImageCropper AspectRatio not updating on image load #4720

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
bbed16e
Fixed AspectRatio on ImageCropper not updating when image is loaded o…
Arlodotexe Aug 10, 2022
c0b2ec5
Removed uneeded resize animation
Arlodotexe Aug 17, 2022
24391ac
Merge branch 'main' into fix/imagecropper-aspect-ratio-not-updating-o…
Arlodotexe Sep 14, 2022
b09ecc6
Added notes and cleaned up code
Arlodotexe Sep 15, 2022
eaf4de2
Extracted UpdateImageLayout call from UpdateAspectRatio
Arlodotexe Sep 15, 2022
aec742b
Extracted UpdateMaskArea out of UpdatedSelectedRect, renamed to Updat…
Arlodotexe Sep 15, 2022
56fd8d1
Extracted UpdateSelectionThumbs and UpdateMaskArea out of UpdateImage…
Arlodotexe Sep 15, 2022
16d2897
Exracted UpdateSelectionThumbs and UpdateMaskArea out of TryUpdateIma…
Arlodotexe Sep 15, 2022
bc40536
Removed extra call to UpdateMaskArea
Arlodotexe Sep 15, 2022
5dc8958
Removed second extra call to UpdateMaskArea
Arlodotexe Sep 15, 2022
6eee40a
Removed extra call to TryUpdateImageLayout
Arlodotexe Sep 15, 2022
eaea805
Update Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCrop…
Arlodotexe Sep 26, 2022
7c70926
Removed unused using statement
Arlodotexe Sep 26, 2022
311d05c
Merge branch 'fix/imagecropper-aspect-ratio-not-updating-on-image-loa…
Arlodotexe Sep 26, 2022
5b47d71
Removed extra call to UpdateMaskArea
Arlodotexe Sep 26, 2022
4ea8826
Merge branch 'main' into fix/imagecropper-aspect-ratio-not-updating-o…
Arlodotexe Sep 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 26 additions & 5 deletions Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropper.Events.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -171,8 +184,16 @@ private void ImageCanvas_SizeChanged(object sender, SizeChangedEventArgs e)
return;
}

UpdateImageLayout();
UpdateMaskArea();
if (TryUpdateImageLayout())
{
UpdateSelectionThumbs();
}

if (TryUpdateAspectRatio())
{
UpdateSelectionThumbs();
UpdateMaskArea();
}
}
}
}
Loading