Fix contrained layout applying pad multiple times #30108
+50
−25
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.
PR summary
Discovered when I was trying to wrap my head around #30089. Given
On
main
, the gap between the rows of the first column is larger when there are more other columnsCurrently the "submerged margins" function works out the required size of the margin by summing the main margin and the "cb" margin (which includes our initial pad). If I have understood, we then apply that required size to only the main margin. So the "cb" margin size gets added on each time we pass through the loop.
Here I just subtract the "cb" values we started with from the target margin size. So the total margin should be what we are aiming for. So the above code now gives:
Given that some test images changed, I'm unsure if this would count as an API change.
PR checklist