Fix AspectFit image stretching on iOS and macOS by including IFileImageSource in InvalidateMeasure condition #30593
+1,058
−998
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…dateMeasure condition Co-authored-by: mattleibow <1096616+mattleibow@users.noreply.github.com>
Copilot
AI
changed the title
Copilot finished work on behalf of
mattleibow
July 11, 2025 20:26
mattleibow
requested changes
Jul 12, 2025
| @@ -67,7 +67,7 @@ public override void SetImageSource(UIImage? platformImage) | |||
|
|
|||
| Handler?.UpdateValue(nameof(IImage.IsAnimationPlaying)); | |||
|
|
|||
| if (Handler?.VirtualView is IImage image && image.Source is IStreamImageSource) | |||
| if (Handler?.VirtualView is IImage image && (image.Source is IStreamImageSource || image.Source is IFileImageSource)) | |||
There was a problem hiding this comment.
Why do we even have type checks? We should always invalidate.
There was a problem hiding this comment.
You're absolutely right. I've removed the type checking logic completely. Now InvalidateMeasure is called whenever a new image is set, regardless of the image source type. This is cleaner and more robust than maintaining a list of specific types that need invalidation. Change made in f21941f.
…lidateMeasure when image is set This addresses @mattleibow's feedback to remove the type checking logic and always invalidate measure when a new image is set, regardless of the image source type. Co-authored-by: mattleibow <1096616+mattleibow@users.noreply.github.com>
Copilot finished work on behalf of
mattleibow
July 12, 2025 10:46
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Note
Are you waiting for the changes in this PR to be merged?
It would be very helpful if you could test the resulting artifacts from this PR and let us know in a comment if this change resolves your issue. Thank you!
Description
This PR fixes an issue where
AspectFitfails to preserve image stretching on iOS and macOS when images are loaded from files usingImageSource.FromFile(). The problem occurred specifically in scenarios where:ImageSource.FromFile()withAspect="AspectFit"Problem
On Windows and Android, images displayed correctly with proper AspectFit stretching:
However, on iOS and macOS, the same images failed to stretch properly and appeared at their original size:
Root Cause
The issue was in
ImageHandler.iOS.cswhereInvalidateMeasurewas only being called forIStreamImageSourcetypes, but not forIFileImageSourcetypes. When images are loaded from files, they need to trigger layout invalidation to ensure proper aspect ratio handling.File-based images (created via
ImageSource.FromFile()) implementIFileImageSource, notIStreamImageSource, so they weren't triggering the necessary layout invalidation.Solution
Extended the condition to include both
IStreamImageSourceandIFileImageSource:This ensures that both stream-based and file-based images trigger the layout invalidation needed for proper AspectFit behavior on iOS and macOS.
Testing
The fix is minimal and surgical, maintaining full compatibility with existing code while addressing the specific AspectFit issue on iOS and macOS platforms.
Fixes #30465.
💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more Copilot coding agent tips in the docs.