[Merged by Bors] - Upgrade to Taffy 0.3.3 #7859

ickshonpe · 2023-03-01T17:17:00Z

Objective

Upgrade to Taffy 0.3.3

Solution

Upgrade to Taffy 0.3.3 with the grid feature disabled.

Changelog

Changed Taffy version to 0.3.3 and disabled its grid feature.
Added the Start and End variants to AlignItems, AlignSelf, AlignContent and JustifyContent.
Added the SpaceEvenly variant to AlignContent.
Updated from_style for Taffy 0.3.3.

* Removed the `Undefined` variant from `Val`. * Set Val's default variant to `Auto`. * Updated ui examples. * Removed `Val::Undefined` conversion code.

* Removed the `Undefined` variant of the `Val` enum. * Changed `UiRect::default()` to set all fields to `Val::Px(0.0)`. * Added the `Inset` type that is a copy of `UiRect` but its defaults are all `Val::Auto`. * Renamed the `position` field of `Style` to `inset` and changed its type to `Inset`. * Updated the UI examples to remove or replace any use of `Val::Undefined`. * Updated the UI examples to use `Inset`.

…-val-undefined

Added a type `Breadth`, that is similar to `Val` but with only evaluatable variants. Gave UiRect a type parameter, so it can take `Breadth` or `Val` values. Added tests for `Breadth` and `UiRect`. Changed style properties to use `Breadth` instead of `Val` for the padding and border properties. Changed `bevy_ui::flex::convert::from_rect` to take an `UiRect<T: Into<Val>>` instead of a `UiRect`. Made minimal necessary changes to the examples.

…padding and border values in `bevy_ui::flex::convert::from_style`

* Added a new trait `MeasureNode`. * Added new structs `ImageMeasure` and `BasicMeasure` that implement `MeasureNode`. * Add a field to `CalculatedSize` called `measure` that takes a boxed `MeasureNode`. * `upsert_leaf` uses the `measure` of `CalculatedSize` to create a `MeasureFunc` for the node.

* Added the `TextLayoutInfo` component to `TextBundle`. * Added the `TextLayoutInfo` component to `Text2dBundle`. * Changed `TextLayoutInfo` queries to be non-optional.

ickshonpe · 2023-03-02T00:42:53Z

I got carried away again. There's no need to include the Val changes in this PR. Reverted everything and kept only the minimum changes to support the Taffy update with no breaking changes.

alice-i-cecile · 2023-03-02T00:43:54Z

I got carried away again. There's no need to include the Val changes in this PR. Reverted everything and kept only the minimum changes to support the Taffy update with no breaking changes.

Good, I was wondering about that :)

alice-i-cecile · 2023-03-02T00:44:47Z

@ickshonpe I think I'd like to leave the grid support to a seperate PR and merge this more quickly. It's significantly more involved, and there's no reason to block the performance improvements and bug fixes.

ickshonpe · 2023-03-02T01:19:03Z

@ickshonpe I think I'd like to leave the grid support to a seperate PR and merge this more quickly. It's significantly more involved, and there's no reason to block the performance improvements and bug fixes.

Agreed, grid should be implemented in another PR. This seems fine as it is now.

crates/bevy_ui/src/ui_node.rs

crates/bevy_ui/src/flex/convert.rs

crates/bevy_ui/src/ui_node.rs

nicoburns · 2023-03-02T11:15:27Z

crates/bevy_ui/src/flex/convert.rs

-        bottom: from_val(scale_factor, rect.bottom),
+fn from_breadth(scale_factor: f64, breadth: Breadth) -> LengthPercentage {
+    match breadth {
+        Breadth::Percent(value) => LengthPercentage::Percent(value / 100.0),


Yeah, I was thinking something like PercentAsFloat or PercentAsDecimal. Val::Percent(1.0) is definitely confusing! Taffy currently has the same issue.

nicoburns · 2023-03-02T11:17:19Z

crates/bevy_ui/src/geometry.rs

 /// };
 /// ```
 #[derive(Copy, Clone, PartialEq, Debug, Reflect)]
 #[reflect(PartialEq)]
-pub struct UiRect {
+pub struct UiRect<T: Default + Copy + Clone + PartialEq = Val> {


You could also just remove the defaults

nicoburns · 2023-03-02T11:18:23Z

crates/bevy_ui/src/ui_node.rs

+#[derive(Copy, Clone, PartialEq, Eq, Debug, Serialize, Deserialize, Reflect)]
+#[reflect(PartialEq, Serialize, Deserialize)]
+pub enum JustifySelf {
+    Auto,


I'm not quite sure what JustifySelf does. I thought it was a grid property but it's not part of Taffy's grid feature.

Correct. It not being feature flagged by grid in Taffy is a bug (unnoticed because having an extra style property doesn't break anything).

crates/bevy_ui/src/flex/convert.rs

* Added the variant `Unset` to `AlignItems`. * Improved the documentation for the `Style` enum properties.

nicoburns · 2023-03-02T16:16:46Z

crates/bevy_ui/src/ui_node.rs

@@ -412,26 +418,26 @@ impl Default for AlignSelf {
 #[derive(Copy, Clone, PartialEq, Eq, Debug, Serialize, Deserialize, Reflect)]
 #[reflect(PartialEq, Serialize, Deserialize)]
 pub enum AlignContent {
-    /// Items are packed toward the start of the axis
+    /// Each line moves towards the start of the cross axis.


"cross axis" is true for Flexbox. But Grid has no "main" or "cross" axis. It only has "block" (vertical with left-to-right writing mode) and "inline" (horizontal with left-to-right writing mode). For grid, the align* properties apply to the block axis and the justify* properties apply to the inline axis.

… of JustifyContent.

ickshonpe · 2023-03-04T00:58:34Z

Removed the extra enum variants and comments that were grid specific.
There are no breaking changes at all. I think this is ready now.

nicoburns

I'm still not 100% familiar with bevy's style setup, but this looks good to me.

alice-i-cecile · 2023-03-04T01:39:49Z

I've taken a thorough look through the code and run the examples. This is ready: I'm glad the migration was so easy. Going to merge now: in its current form it's an uncontroversial perf + bug fix PR due to things resolved in taffy.

For the many_buttons stress test, I'm getting about 50 FPS in release on both this branch and main.

We can add CSS grid support and remove Val::Undefined shortly after 0.10 drops.

bors r+

nicoburns · 2023-03-04T11:47:56Z

@alice-i-cecile Bors doesn't seem to be doing anything with this. Could it perhaps be the milestone label which is preventing it from being merged?

alice-i-cecile · 2023-03-04T14:09:29Z

Milestone shouldn't be having an effect. Sometimes bors just gets sleepy (the scanning process isn't fully reliable IME) ;)

bors r+

# Objective Upgrade to Taffy 0.3.3 Fixes: #7712 ## Solution Upgrade to Taffy 0.3.3 with the `grid` feature disabled. --- ## Changelog * Changed Taffy version to 0.3.3 and disabled its `grid` feature. * Added the `Start` and `End` variants to `AlignItems`, `AlignSelf`, `AlignContent` and `JustifyContent`. * Added the `SpaceEvenly` variant to `AlignContent`. * Updated `from_style` for Taffy 0.3.3.

bors · 2023-03-04T14:31:23Z

Pull request successfully merged into main.

Build succeeded:

# Objective Upgrade to Taffy 0.3.3 Fixes: bevyengine#7712 ## Solution Upgrade to Taffy 0.3.3 with the `grid` feature disabled. --- ## Changelog * Changed Taffy version to 0.3.3 and disabled its `grid` feature. * Added the `Start` and `End` variants to `AlignItems`, `AlignSelf`, `AlignContent` and `JustifyContent`. * Added the `SpaceEvenly` variant to `AlignContent`. * Updated `from_style` for Taffy 0.3.3.

ickshonpe added 30 commits February 2, 2023 19:48

changes:

5573ea6

* Removed the `Undefined` variant from `Val`. * Set Val's default variant to `Auto`. * Updated ui examples. * Removed `Val::Undefined` conversion code.

Changed inset doc comments

b274e9e

cargo fmt --all

9cffde9

fixed UiRect doc tests

8ed613f

Another Doc comment fix

9bdf85e

fix doc comments

54f68ce

renamed Inset to Position

ce52876

cargo fmt --all

abdef25

update ui example

5e814cf

Removed Position struct, added its fields directly to Style

2087be6

fix doc comments

99b93f8

fix doc comment

5ab3ffd

added some simple tests

eb88a97

cargo fmt

6113911

Merge branch 'main' of https://github.com/bevyengine/bevy into remove…

cc8d6d4

…-val-undefined

improved the Breadth doc comment description

4b2c93b

impl From<UiRect<Breadth> for <UiRect<Val> and use it to convert the …

9597f15

…padding and border values in `bevy_ui::flex::convert::from_style`

cargo fmt --all

7d02b25

added plugin type registrations for Breadth and UiRect<Breadth>

7ef9ca4

Improved the doc comments for Breadth

087fc9e

collected and tidied up test imports

d558224

cargo fmt

b1712b8

fix lints

080aae7

cargo fmt

9c4c01d

impl Measure for Fn

8934a6f

Changes:

fc9b2d9

* Added the `TextLayoutInfo` component to `TextBundle`. * Added the `TextLayoutInfo` component to `Text2dBundle`. * Changed `TextLayoutInfo` queries to be non-optional.

cargo fmt --all

f7d20ea

alice-i-cecile added C-Dependencies A change to the crates that Bevy depends on and removed M-Needs-Migration-Guide A breaking change to Bevy's public API that needs to be noted in a migration guide labels Mar 2, 2023

ickshonpe added 2 commits March 2, 2023 01:02

Changed convert helper functions to private

9d0bc99

cargo fmt

d55df84

renamed convert's helper functions for clarity

5c814d2

nicoburns suggested changes Mar 2, 2023

View reviewed changes

ickshonpe added 2 commits March 2, 2023 16:10

changes:

370b851

* Added the variant `Unset` to `AlignItems`. * Improved the documentation for the `Style` enum properties.

cargo fmt --all

126c9fc

nicoburns reviewed Mar 2, 2023

View reviewed changes

ickshonpe added 4 commits March 3, 2023 12:33

clean up convert

65f732b

cargo fmt --all

a89104e

fix lints

efb48ed

Removed the Unset variant of AlignItems and the Stretch variant…

5cf3bbe

… of JustifyContent.

nicoburns approved these changes Mar 4, 2023

View reviewed changes

alice-i-cecile approved these changes Mar 4, 2023

View reviewed changes

alice-i-cecile added the S-Ready-For-Final-Review This PR has been approved by the community. It's ready for a maintainer to consider merging it label Mar 4, 2023

bors bot changed the title ~~Upgrade to Taffy 0.3.3~~ [Merged by Bors] - Upgrade to Taffy 0.3.3 Mar 4, 2023

bors bot closed this Mar 4, 2023

mockersf removed this from the 0.11 milestone Mar 4, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Merged by Bors] - Upgrade to Taffy 0.3.3 #7859

[Merged by Bors] - Upgrade to Taffy 0.3.3 #7859

ickshonpe commented Mar 1, 2023 •

edited

Loading

ickshonpe commented Mar 2, 2023 •

edited

Loading

alice-i-cecile commented Mar 2, 2023

alice-i-cecile commented Mar 2, 2023

ickshonpe commented Mar 2, 2023

nicoburns Mar 2, 2023

nicoburns Mar 2, 2023

nicoburns Mar 2, 2023

nicoburns Mar 2, 2023

ickshonpe commented Mar 4, 2023

nicoburns left a comment

alice-i-cecile commented Mar 4, 2023

nicoburns commented Mar 4, 2023

alice-i-cecile commented Mar 4, 2023

bors bot commented Mar 4, 2023

[Merged by Bors] - Upgrade to Taffy 0.3.3 #7859

[Merged by Bors] - Upgrade to Taffy 0.3.3 #7859

Conversation

ickshonpe commented Mar 1, 2023 • edited Loading

Objective

Solution

Changelog

ickshonpe commented Mar 2, 2023 • edited Loading

alice-i-cecile commented Mar 2, 2023

alice-i-cecile commented Mar 2, 2023

ickshonpe commented Mar 2, 2023

nicoburns Mar 2, 2023

Choose a reason for hiding this comment

nicoburns Mar 2, 2023

Choose a reason for hiding this comment

nicoburns Mar 2, 2023

Choose a reason for hiding this comment

nicoburns Mar 2, 2023

Choose a reason for hiding this comment

ickshonpe commented Mar 4, 2023

nicoburns left a comment

Choose a reason for hiding this comment

alice-i-cecile commented Mar 4, 2023

nicoburns commented Mar 4, 2023

alice-i-cecile commented Mar 4, 2023

bors bot commented Mar 4, 2023

ickshonpe commented Mar 1, 2023 •

edited

Loading

ickshonpe commented Mar 2, 2023 •

edited

Loading