Enable correct image measure functions #661
Merged
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
nicoburns
added
bug
nicoburns
force-pushed
the
bevy-issue-13155
branch
from
81be7ca
to
d3a2c11
Compare
Weibye
approved these changes
May 28, 2024
There was a problem hiding this comment.
It's been a while since I looked at complex rust code & spent time looking at taffy so I'm a bit rusty, pun intended.
The code looks good, clean and structured 👍
The high level changes makes sense to me, as well as making the Maybe / Resolve traits public.
I think the only thing missing may be an example showcasing how or when you would use this in practice, but that may also be part of a future PR.
TimJentzsch
reviewed
May 29, 2024
alice-i-cecile
approved these changes
May 30, 2024
|
I'm happy with the overall fix here. I'll let you handle the release process by default, but let me know if you'd like a hand at any point :) |
github-merge-queue bot
pushed a commit
to bevyengine/bevy
that referenced
this pull request
May 30, 2024
…zes (#13555) # Objective - Fixes #13155 - fixes #13517 - Supercedes #13381 - Requires DioxusLabs/taffy#661 ## Solution - Taffy has been updated to: - Apply size styles to absolutely positioned children - Pass the node's `Style` through to the measure function - Bevy's image measure function has been updated to make use of this style information ## Notes - This is currently using a git version of Taffy. If this is tested as fixing the issue then we can turn that into a Taffy 0.5 release (this would be the only change between Taffy 0.4 and Taffy 0.5 so upgrading is not expected to be an issue) - This implementation may not be completely correct. I would have preferred to extend Taffy's gentest infrastructure to handle images and used that to nail down the correct behaviour. But I don't have time for that atm so we'll have to iterate on this in future. This PR at least puts that under Bevy's control. ## Testing - I manually tested the game_menu_example (from #13155) - More testing is probably merited --- ## Changelog No changelog should be required as it fixes a regression on `main` that was not present in bevy 0.13. The changelog for "Taffy upgrade" may want to be changed from 0.4 to 0.5 if this change gets merged. --------- Co-authored-by: Alice Cecile <alice.i.cecile@gmail.com> Co-authored-by: François Mockers <francois.mockers@vleue.com>
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.
Objective
Allow image measure functions to correctly apply their inherent aspect ratio to style sizes.
Context
Changes made
SizingMode::Inherentwhen sizing absolute children of flexbox nodes. This basically turns on application of styles which is what we want.style: &Styleinto measure functions. This allows measure functions to access a node's styles which is necessary if they are to apply their aspect ratio to those styles.MaybeMath,MaybeResolveandResolveOrZerotraits public. These were previously private to keep Taffy's API surface area smaller, but they're very useful when implementing the image measure function as above.Notes
Display::Replacedmode that knows about aspect ratios). This is the quick fix targeting the upcoming Bevy 0.14 release.known_sizebut this breaks some other use cases that I can't remember right now)