Ensure that second-pass measures of Auto rows/columns are allowed to expand #14315
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
|
Thank you for your pull request. We are auto-formatting your source code to follow our code guidelines. |
|
Is there a workaround ? |
rmarinho
added
the
backport/suggested
To the PR? |
Eilon
added
the
area-layout
mattleibow
approved these changes
Mar 31, 2023
|
/backport to net7.0 |
|
Started backporting to net7.0: https://github.com/dotnet/maui/actions/runs/4579577198 |
|
@mattleibow backporting to net7.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Ensure that second-pass measures of Auto rows/columns are allowed to expand Fixes #14296
.git/rebase-apply/patch:101: trailing whitespace.
// These next two tests validate cases where the Grid structure necessitates multiple
.git/rebase-apply/patch:108: trailing whitespace.
public void AutoRowIsDominatedByTallestView(double unconstrainedHeight, double constrainedHeight)
warning: 2 lines add whitespace errors.
Using index info to reconstruct a base tree...
M src/Core/src/Layouts/GridLayoutManager.cs
M src/Core/tests/UnitTests/Layouts/GridLayoutManagerTests.cs
Falling back to patching base and 3-way merge...
Auto-merging src/Core/tests/UnitTests/Layouts/GridLayoutManagerTests.cs
CONFLICT (content): Merge conflict in src/Core/tests/UnitTests/Layouts/GridLayoutManagerTests.cs
Auto-merging src/Core/src/Layouts/GridLayoutManager.cs
CONFLICT (content): Merge conflict in src/Core/src/Layouts/GridLayoutManager.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Ensure that second-pass measures of Auto rows/columns are allowed to expand Fixes #14296
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
@mattleibow an error occurred while backporting to net7.0, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
rmarinho
pushed a commit
that referenced
this pull request
Apr 11, 2023
) * Fix edge case with Grids, *s, and unconstrained layouts * Auto-format source code * Ensure that second-pass measures of Auto rows/columns are allowed to expand (#14315) Fixes #14296 # Conflicts: # src/Core/src/Layouts/GridLayoutManager.cs --------- Co-authored-by: E.Z. Hart <hartez@gmail.com> Co-authored-by: GitHub Actions Autoformatter <autoformat@example.com> Co-authored-by: E.Z. Hart <hartez@users.noreply.github.com>
hartez
added
the
backport/approved
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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
In situations where the Grid is forced to do a second measure pass to resolve Star values which intersect with Auto values, the measurement in the alternate axis was being constrained to the size of the items measured in the first pass. This especially causes problems for Labels, which are more likely to measure taller when their width is constrained on the second pass.
These changes ensure that Auto values are recognized when doing the second measure pass.
Issues Fixed
Fixes #14296
Fixes #14991