Fix Window.MeasureOverride measuring with the old ClientSize #18338
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
MrJul
added
bug
customer-priority
grokys
approved these changes
Feb 28, 2025
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
MrJul
added a commit
that referenced
this pull request
Feb 28, 2025
MrJul
added
backported-11.2.x
and removed
backport-candidate-11.2.x
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.
What does the pull request do?
This PR fixes
Window.MeasureOverrideincorrectly measuring its child using its oldClientSizewhen theWidthorHeightof the window is manually set (andSizeToContent == Manual).An existing unit test
Child_Should_Be_Measured_With_Width_And_Height_If_SizeToContent_Is_Manualhas been amended, making sure that the logic is still properly applied whenWindow.Width/Heightchanges.What is the current behavior?
Setting
Window.Width/Heighttriggers a measure pass with the oldClientSizeinstead of the new bounds. The child's measure call is ignored (since the measure bounds haven't changed). However, this still updates the Window'sDesiredSizeto the new bounds, causing an arrange pass to be triggered. Later, the window bounds effectively change, causing another layout pass, this time callingMeasurewith the proper values.From the child's point of view,
Arrange(from the first layout pass) is called beforeMeasure(from the second layout pass).What is the updated/expected behavior with this PR?
The child is properly measured with the new bounds, causing a single normal measure pass.