Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Closed
wants to merge 88 commits into from

Commits on Feb 2, 2023

  1. changes:

        * Removed the `Undefined` variant from `Val`.
        * Set Val's default variant to `Auto`.
        * Updated ui examples.
        * Removed `Val::Undefined` conversion code.
    ickshonpe committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    5573ea6 View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2023

  1. changes:

        * 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`.
    ickshonpe committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    26eeca7 View commit details
    Browse the repository at this point in the history
  2. Changed inset doc comments

    ickshonpe committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    b274e9e View commit details
    Browse the repository at this point in the history
  3. cargo fmt --all

    ickshonpe committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    9cffde9 View commit details
    Browse the repository at this point in the history
  4. fixed UiRect doc tests

    ickshonpe committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    8ed613f View commit details
    Browse the repository at this point in the history
  5. Another Doc comment fix

    ickshonpe committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    9bdf85e View commit details
    Browse the repository at this point in the history
  6. fix doc comments

    ickshonpe committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    54f68ce View commit details
    Browse the repository at this point in the history
  7. renamed Inset to Position

    ickshonpe committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    ce52876 View commit details
    Browse the repository at this point in the history
  8. cargo fmt --all

    ickshonpe committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    abdef25 View commit details
    Browse the repository at this point in the history
  9. update ui example

    ickshonpe committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    5e814cf View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    2087be6 View commit details
    Browse the repository at this point in the history
  11. fix doc comments

    ickshonpe committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    99b93f8 View commit details
    Browse the repository at this point in the history
  12. fix doc comment

    ickshonpe committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    5ab3ffd View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2023

  1. added some simple tests

    ickshonpe committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    eb88a97 View commit details
    Browse the repository at this point in the history
  2. cargo fmt

    ickshonpe committed Feb 7, 2023
    Configuration menu
    Copy the full SHA
    6113911 View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2023

  1. Configuration menu
    Copy the full SHA
    cc8d6d4 View commit details
    Browse the repository at this point in the history
  2. changes:

            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.
    ickshonpe committed Feb 8, 2023
    Configuration menu
    Copy the full SHA
    684b32a View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    4b2c93b View commit details
    Browse the repository at this point in the history
  4. impl From<UiRect<Breadth> for <UiRect<Val> and use it to convert the …

    …padding and border values in `bevy_ui::flex::convert::from_style`
    ickshonpe committed Feb 8, 2023
    Configuration menu
    Copy the full SHA
    9597f15 View commit details
    Browse the repository at this point in the history
  5. cargo fmt --all

    ickshonpe committed Feb 8, 2023
    Configuration menu
    Copy the full SHA
    7d02b25 View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2023

  1. Configuration menu
    Copy the full SHA
    7ef9ca4 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    087fc9e View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    d558224 View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2023

  1. changes:

    * 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.
    ickshonpe committed Feb 17, 2023
    Configuration menu
    Copy the full SHA
    3a09af9 View commit details
    Browse the repository at this point in the history
  2. cargo fmt

    ickshonpe committed Feb 17, 2023
    Configuration menu
    Copy the full SHA
    b1712b8 View commit details
    Browse the repository at this point in the history
  3. fix lints

    ickshonpe committed Feb 17, 2023
    Configuration menu
    Copy the full SHA
    080aae7 View commit details
    Browse the repository at this point in the history
  4. cargo fmt

    ickshonpe committed Feb 17, 2023
    Configuration menu
    Copy the full SHA
    9c4c01d View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2023

  1. impl Measure for Fn

    ickshonpe committed Feb 18, 2023
    Configuration menu
    Copy the full SHA
    8934a6f View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2023

  1. Changes:

        * Added the `TextLayoutInfo` component to `TextBundle`.
        * Added the `TextLayoutInfo` component to `Text2dBundle`.
        * Changed `TextLayoutInfo` queries to be non-optional.
    ickshonpe committed Feb 19, 2023
    Configuration menu
    Copy the full SHA
    fc9b2d9 View commit details
    Browse the repository at this point in the history
  2. cargo fmt --all

    ickshonpe committed Feb 19, 2023
    Configuration menu
    Copy the full SHA
    f7d20ea View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2023

  1. Configuration menu
    Copy the full SHA
    13091a3 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'split-text-system' of https://github.com/ickshonpe/bevy

    …into split-text-system
    ickshonpe committed Feb 21, 2023
    Configuration menu
    Copy the full SHA
    cfdb649 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    621a117 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    3981c7f View commit details
    Browse the repository at this point in the history
  5. changes:

    * Renamed `CalculatedSize` to `IntrinsicSize`. It is now non-copy. Added a field `measure` and removed `preserve_aspect_ratio`.
    * Added `measurement` module to `bevy_ui`
    * Added `Measure` trait. A `Measure` is used to compute the size of an intrisically sized node.
    * Added `ImageMeasure` and `FixedMeasure` `Measure` implementations.
    * Changed `update_image_calculated_size_system` to use `ImageMeasure`.
    * Changed `upsert_leaf` to use the `Measure` of `CalculatedSize` for the `MeasureFunc` of intrinsically sized nodes.
    ickshonpe committed Feb 21, 2023
    Configuration menu
    Copy the full SHA
    b004072 View commit details
    Browse the repository at this point in the history
  6. changes:

    * Added the system (dummy atm) `measure_text_system`
    * Changed the system execution order so that `measure_text_system` replaces `text_system` in the order.
    `text_system` now runs after `UiSystem::Flex`.
    
    Previously the `text_system` ran before the layout was calculated and the size of the text node was determined,
    so it couldn't shape the text correctly to fit the layout, and had no way of determining if the text needed to be wrapped.
    There was a hack, the system `text_constraint` that tried to determine the size of the node from the local size constraints of the node in its `Style` component.
    This could not work correctly, `Val::Percent` constraints just had to be ignored as they are calcualted from size of the parent node and the `Val::Px` constraints are just a guess,
    without computing the rest of the layout.
    Also because the `text_system` queried for changes to the `Style` component, and not the `Node` component, it couldn't react to changes in the layout correctly.
    The layout system then wouldn't recieve all the information it would need to fit the text node correctly, such as the `max-content` and `min-content` sizes.
    ickshonpe committed Feb 21, 2023
    Configuration menu
    Copy the full SHA
    af7b6f2 View commit details
    Browse the repository at this point in the history
  7. changes:

    * implemented the `measure_text_system` function.
    * Added the `TextMeasure` type that implements measure.
    * Added the `TextQueue` resource struct.
    * Added methods to the `TextPipeline` to get min and max content sizes for the text.
    ickshonpe committed Feb 21, 2023
    Configuration menu
    Copy the full SHA
    2280bb0 View commit details
    Browse the repository at this point in the history
  8. Clean up and bug fixes.

    changes:
    * Removed `TextQueue`
    * Added `min_content`, `max_content` and `ideal` fields to IntrinsicSize.
    * Added `ideal_height` field to `TextMeasure`.
    * Fixed text system queueing and change detection issues. `measure_text_system` only queries for modified `Text`,
    `text_system` queuries for `Text` or `Node` changes.
    ickshonpe committed Feb 21, 2023
    Configuration menu
    Copy the full SHA
    f510899 View commit details
    Browse the repository at this point in the history
  9. simplified text size code

    ickshonpe committed Feb 21, 2023
    Configuration menu
    Copy the full SHA
    95d7c96 View commit details
    Browse the repository at this point in the history
  10. fix derivable impls

    ickshonpe committed Feb 21, 2023
    Configuration menu
    Copy the full SHA
    91a05d2 View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2023

  1. Configuration menu
    Copy the full SHA
    c6602c7 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    48746e0 View commit details
    Browse the repository at this point in the history
  3. fix missed merge conflict

    ickshonpe committed Feb 25, 2023
    Configuration menu
    Copy the full SHA
    637711e View commit details
    Browse the repository at this point in the history
  4. updated taffy version

    ickshonpe committed Feb 25, 2023
    Configuration menu
    Copy the full SHA
    84ac898 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    48c456e View commit details
    Browse the repository at this point in the history
  6. fix available space import

    ickshonpe committed Feb 25, 2023
    Configuration menu
    Copy the full SHA
    547f99c View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2023

  1. Configuration menu
    Copy the full SHA
    cc4ec14 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    1471f3b View commit details
    Browse the repository at this point in the history
  3. update convert

    ickshonpe committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    02679cd View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    aec59ec View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    2572c39 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    a513acb View commit details
    Browse the repository at this point in the history
  7. Changes:

    * cleaned up conversion and geometry
    * fixed examples
    ickshonpe committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    33c8e91 View commit details
    Browse the repository at this point in the history
  8. cargo fmt --all

    ickshonpe committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    796b2e1 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    115f98c View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    492bbaf View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    21fd333 View commit details
    Browse the repository at this point in the history
  12. Tidied up imports

    ickshonpe committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    623c287 View commit details
    Browse the repository at this point in the history
  13. Removed Text2d changes.

    ickshonpe committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    e5a6144 View commit details
    Browse the repository at this point in the history
  14. Update crates/bevy_ui/src/ui_node.rs

    Co-authored-by: Alice Cecile <alice.i.cecile@gmail.com>
    ickshonpe and alice-i-cecile committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    035f0dc View commit details
    Browse the repository at this point in the history
  15. Removed JustifySelf

    ickshonpe committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    6f32916 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    cfadf55 View commit details
    Browse the repository at this point in the history
  17. Revert "Update crates/bevy_ui/src/ui_node.rs"

    This reverts commit 035f0dc.
    ickshonpe committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    3117ed5 View commit details
    Browse the repository at this point in the history
  18. Revert "Removed JustifySelf"

    This reverts commit 6f32916.
    ickshonpe committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    b2000fb View commit details
    Browse the repository at this point in the history
  19. Revert "Removed Text2d changes."

    This reverts commit e5a6144.
    ickshonpe committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    b52f7ac View commit details
    Browse the repository at this point in the history
  20. Revert "Tidied up imports"

    This reverts commit 623c287.
    ickshonpe committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    333dda0 View commit details
    Browse the repository at this point in the history
  21. Revert "Register JustifySelf and Size<Breadth>"

    This reverts commit 21fd333.
    ickshonpe committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    0a99ab8 View commit details
    Browse the repository at this point in the history
  22. Configuration menu
    Copy the full SHA
    e7665c1 View commit details
    Browse the repository at this point in the history
  23. Revert "Fixed some integration test complaints"

    This reverts commit 115f98c.
    ickshonpe committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    108d7a7 View commit details
    Browse the repository at this point in the history
  24. Revert "cargo fmt --all"

    This reverts commit 796b2e1.
    ickshonpe committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    6f70b0a View commit details
    Browse the repository at this point in the history
  25. Revert "Changes:"

    This reverts commit 33c8e91.
    ickshonpe committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    7405f47 View commit details
    Browse the repository at this point in the history
  26. Revert "Merge branch 'breadth' of https://github.com/ickshonpe/bevy i…

    …nto taffy-0.3.3"
    
    This reverts commit a513acb.
    ickshonpe committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    c7b19e9 View commit details
    Browse the repository at this point in the history
  27. Revert "Fixed FlexSurface for Taffy 0.3.3"

    This reverts commit 2572c39.
    ickshonpe committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    1b2aece View commit details
    Browse the repository at this point in the history
  28. Revert "Merge branch 'taffy-latest' of https://github.com/ickshonpe/bevy

     into taffy-0.3.3"
    
    This reverts commit aec59ec.
    ickshonpe committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    e897d42 View commit details
    Browse the repository at this point in the history
  29. Revert "update convert"

    This reverts commit 02679cd.
    ickshonpe committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    434db4f View commit details
    Browse the repository at this point in the history
  30. Revert "Merge remote-tracking branch 'origin/remove-val-undefined' in…

    …to taffy-0.3.3"
    
    This reverts commit 1471f3b.
    ickshonpe committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    4383fe0 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2023

  1. changes:

    * disabled Taffy's gap feature
    * added `Stretch`, `Start` and `End` variants to `Style` enums where appropriate.
    * Modified `from_style` and associated helper functions to work with Taffy 0.3.3
    ickshonpe committed Mar 2, 2023
    Configuration menu
    Copy the full SHA
    3db183f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    1dc0c48 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    dcfda78 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    9d0bc99 View commit details
    Browse the repository at this point in the history
  5. cargo fmt

    ickshonpe committed Mar 2, 2023
    Configuration menu
    Copy the full SHA
    d55df84 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    5c814d2 View commit details
    Browse the repository at this point in the history
  7. changes:

    * Added the variant `Unset` to `AlignItems`.
    * Improved the documentation for the `Style` enum properties.
    ickshonpe committed Mar 2, 2023
    Configuration menu
    Copy the full SHA
    370b851 View commit details
    Browse the repository at this point in the history
  8. cargo fmt --all

    ickshonpe committed Mar 2, 2023
    Configuration menu
    Copy the full SHA
    126c9fc View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2023

  1. clean up convert

    ickshonpe committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    65f732b View commit details
    Browse the repository at this point in the history
  2. cargo fmt --all

    ickshonpe committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    a89104e View commit details
    Browse the repository at this point in the history
  3. fix lints

    ickshonpe committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    efb48ed View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2023

  1. Removed the Unset variant of AlignItems and the Stretch variant…

    … of JustifyContent.
    ickshonpe committed Mar 4, 2023
    Configuration menu
    Copy the full SHA
    5cf3bbe View commit details
    Browse the repository at this point in the history