-
Notifications
You must be signed in to change notification settings - Fork 1.6k
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.
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
[iOS] Fix Button image sizing and layout #22476
Draft
tj-devel709
wants to merge
25
commits into
main
Choose a base branch
from
dev/TJ/iOS18242-Compat3-FixRotation
base: main
Could not load branches
Branch not found: {{ refName }}
Could not load tags
Nothing to show
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Conversation
This file contains 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
tj-devel709
added
platform/iOS 🍎
partner/cat 😻
Client CAT Team
area-controls-button
Button, ImageButton
labels
May 17, 2024
I think this needs to rethink how the Measure for the button is taken in the case of moving all the layout logic into the ArrangeOverride |
tj-devel709
force-pushed
the
dev/TJ/iOS18242-Compat3-FixRotation
branch
from
May 22, 2024 14:54
fb92003
to
a6d0772
Compare
tj-devel709
force-pushed
the
dev/TJ/iOS18242-Compat3-FixRotation
branch
from
May 23, 2024 14:44
44f5aa8
to
3147b11
Compare
tj-devel709
commented
May 23, 2024
|
||
namespace Microsoft.Maui.Controls | ||
{ | ||
public partial class Button | ||
{ | ||
CGSize _originalImageSize = CGSize.Empty; | ||
|
||
protected override Size MeasureOverride(double widthConstraint, double heightConstraint) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Note: To add MeasureOverride, I needed to add this method to the publicAPI.Unshipped. Do-able for SR?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
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.
Description of Change
This PR is a continuation of this previous PR: #21759.
The past PR was rolled-back because it contained an infinite loop in certain circumstances when the parent of the button was resized.
To combat this, the iOS button layout code was moved to the ArrangeOverride method with the size allotted from the parent. This also matches where Android and Windows calculates and arranges the layout.
UITest changing the parent size and rotation:
ButtonRotationResizing.mov
UITest testing the measuring code and changing the image position:
iOSButtonChangingLayoutPosition.mov
UITest testing the image resizing when BorderWidth changes
iOSButtonBorderWidth.mov
If you'd like to test some cases, here are some code samples:
Issues Fixed
Fixes #22306