Update taffy to 0.9 and fix Grid errors #21240 #21672
Conversation
rossleonardy
changed the title
crates/bevy_ui/Cargo.toml
Outdated
|
|
||
| # other | ||
| taffy = { version = "0.7" } | ||
| taffy = { version = "0.9", default-features = false, features = ["std", "block_layout", "flexbox", "grid", "content_size", "alloc", "taffy_tree"] } |
There was a problem hiding this comment.
The calc feature puts !Send+!Sync stuff everywhere, so it breaks derive(Resource) among other things. Manually excluding it here.
| .collect::<Vec<_>>(), | ||
| grid_row: node.grid_row.into(), | ||
| grid_column: node.grid_column.into(), | ||
| ..Default::default() |
There was a problem hiding this comment.
The fields added are dummy, item_is_replaced, grid_template_areas, grid_template_column_names, grid_template_row_names. Not sure if this should be using their default or we should add these fields and have our own default.
| Val::Px(val) | ||
| .into_length_percentage(context) | ||
| .into_raw() | ||
| .value(), |
There was a problem hiding this comment.
These rather verbose conversions are due to the fact that we do some math in into_length_percentage and into_length_percentage_auto, I would like to refactor the Val type story but this keeps the behavior the same
| ) -> taffy::style::GridTemplateComponent<S> | ||
| where | ||
| S: CheapCloneStr, | ||
| { |
There was a problem hiding this comment.
This was an add things until it compiles moment, if anyone can explain what the generics mean here I would appreciate it
|
Your PR caused a change in the graphical output of an example or rendering test. This might be intentional, but it could also mean that something broke! If it's expected, please add the M-Deliberate-Rendering-Change label. If this change seems unrelated to your PR, you can consider updating your PR to target the latest main branch, either by rebasing or merging main into it. |
| } | ||
| } | ||
|
|
||
| pub(crate) struct BevyTaffyTree<T>(TaffyTree<T>); |
There was a problem hiding this comment.
This is sort of a patch for an issue with Taffy:
ccbrown/iocraft#119 (comment)
Eventually it will be fixed in
DioxusLabs/taffy#823
|
Your PR caused a change in the graphical output of an example or rendering test. This might be intentional, but it could also mean that something broke! If it's expected, please add the M-Deliberate-Rendering-Change label. If this change seems unrelated to your PR, you can consider updating your PR to target the latest main branch, either by rebasing or merging main into it. |
|
Your PR caused a change in the graphical output of an example or rendering test. This might be intentional, but it could also mean that something broke! If it's expected, please add the M-Deliberate-Rendering-Change label. If this change seems unrelated to your PR, you can consider updating your PR to target the latest main branch, either by rebasing or merging main into it. |
|
Your PR caused a change in the graphical output of an example or rendering test. This might be intentional, but it could also mean that something broke! If it's expected, please add the M-Deliberate-Rendering-Change label. If this change seems unrelated to your PR, you can consider updating your PR to target the latest main branch, either by rebasing or merging main into it. |
|
Your PR caused a change in the graphical output of an example or rendering test. This might be intentional, but it could also mean that something broke! If it's expected, please add the M-Deliberate-Rendering-Change label. If this change seems unrelated to your PR, you can consider updating your PR to target the latest main branch, either by rebasing or merging main into it. |
1 participant
Objective
Solution
I had to make some rather un-ergonomic changes I would like advice on, so I've left comments below.
Testing
Showcase
Fixes issue with grid start and ends...