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.

Sign up for GitHub

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

Jump to bottom

[bevy_ui/layout] Handle ui heirchy change edge cases #13360

Draft
wants to merge 48 commits into
base: main
Choose a base branch
from
Draft

[bevy_ui/layout] Handle ui heirchy change edge cases #13360

wants to merge 48 commits into from
+980 −148

Conversation

StrikeForceZero
Copy link
Contributor

@StrikeForceZero StrikeForceZero commented May 13, 2024 •
edited
Loading

  • I need to open an issue that documents the problem this is solving

Blocked on:

Objective

  • Handle UI Nodes being moved to a new parent Changed<Parent>
  • Handle UI Nodes who lost their parent RemovedComponent<Parent>

Solution

  • Adds query to the layout_system to handle the specified edge cases

Testing

  • Did you test these changes? If so, how?
    • Added Tests
  • Are there any parts that need more testing?
    • Identifying any potential regressions or unknown side effects
  • How can other people (reviewers) test your changes? Is there anything specific they need to know?
    • Testing an example project that emulates a drag-and-drop-like behavior for UI node relationships.
    • Think of alternative edge cases that fit with the scope of this PR.
  • If relevant, what platforms did you test these changes on, and are there any important ones you can't test?
    • Tested on Linux

Changelog

  • Added handling of UI nodes changing parents
  • Added handling of UI nodes removing parents

StrikeForceZero
StrikeForceZero commented May 13, 2024
View reviewed changes
crates/bevy_ui/src/layout/mod.rs
@@ -158,6 +160,82 @@ pub fn ui_layout_system(
}
}

for new_root_node_entity in removed_parents.read() {
// TODO: most of this should be moved into a function on `UiSurface` but the query requirements might feel out of place
Copy link
Contributor Author

@StrikeForceZero StrikeForceZero May 13, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was planning on moving this logic into an associated function on UiSurface, especially with #13359, but passing the queries seems out of scope. I am open to suggestions.

@StrikeForceZero StrikeForceZero force-pushed the dev/bevy_ui/ui_surface_promo_demo branch from 65fb529 to 03fb1fa Compare May 13, 2024 22:42
@StrikeForceZero StrikeForceZero mentioned this pull request May 13, 2024
Open
3 tasks
@alice-i-cecile alice-i-cecile added C-Bug An unexpected or incorrect behavior A-UI Graphical user interfaces, styles, layouts, and widgets S-Waiting-on-Author The author needs to make changes or address concerns before this can be merged labels May 15, 2024
@StrikeForceZero StrikeForceZero mentioned this pull request Jun 22, 2024
Closed
@StrikeForceZero
Add missing asserts and Debug fields in UiSurface from bevyengine#12268…
73175fa 
… and bevyengine#12698
@StrikeForceZero
Widen type for parameter children in UiSurface::update_children
9a79efe
@StrikeForceZero
Add tests for bevy_ui/layout/ui_surface
96c6fb4
@StrikeForceZero
Fix tests after rebase
5c30a41
@StrikeForceZero
Move ui_surface test only methods into mod tests as trait
395e98f
@StrikeForceZero
Mark specific test functions as unreachable
9823fd2
@StrikeForceZero
Remove trait helpers to reduce complexity of tests
b7e0329
@StrikeForceZero
Add tests for helper methods
b9a52c4
@StrikeForceZero
Move helper methods into the single test case where they are used
b1cf531
@StrikeForceZero
Add doc comment to is_root_node_pair_valid
5d9b7ac
@StrikeForceZero
Move test_initialization next to other tests
ad2a4d8
@StrikeForceZero
Rename camera_id to camera_entity
15a576a
@StrikeForceZero
Extract default viewport style into inline fn
636c1a0
@StrikeForceZero
Deprecate user_root_node in RootNodeData
7fc427d
@StrikeForceZero
Implement updated map structure in UiSurface
1d71677
@StrikeForceZero
Replace is_root_node_data_valid helper with has_valid_root_node_data
765be5a
@StrikeForceZero
Apply rustfmt
e46490f
@StrikeForceZero
Remove user_root_node field in favor of using entity_to_taffy
0d3b3e0
@StrikeForceZero
Apply rustfmt
6f8bb88
@StrikeForceZero
Expand tests to cover different methods of despawn
3d0e0ac
@StrikeForceZero
Add support demoting root nodes into normal ui nodes
9c41e4b
@StrikeForceZero
Add test for promoting normal ui nodes into root nodes
8f13f82
@StrikeForceZero
Add explicit taffy node counts to tests
d23f1ca
@StrikeForceZero
Use mark_root_node_as_orphaned
e03dd7e
@StrikeForceZero
Use replace_camera_association to reduce redundant code
d79dd8c
@StrikeForceZero
Update documentation
d66900b
@StrikeForceZero
Fix promote_ui_node, add a test, and set to only be in cfg(test)
959fa81
@StrikeForceZero
Apply rustfmt
e9d856a
@StrikeForceZero
Make missing root_node_data in compute_camera_layout an error
a7645e2
@StrikeForceZero
Add/update documentation for UiSurface
42fd2c8
@StrikeForceZero
Remove message from unreachable!
406017a
@StrikeForceZero
Apply rustfmt in bevy_ui/layout/debug
297faf2
@StrikeForceZero
Add regression test for recursive despawn on ui nodes
67cb603
@StrikeForceZero
Rebase fixes
2589304
@StrikeForceZero
Underscore unused variables
53e3118
@StrikeForceZero
Add missing back ticks in doc comment
93719dd
@StrikeForceZero
Fix documentation
ea56cea
@StrikeForceZero
Apply rustfmt
c3fdd64
@StrikeForceZero
Remove promotion helper
8355553
@StrikeForceZero
Update test
3372c63
@StrikeForceZero
Satisfy linter
794dc60
@StrikeForceZero
Remove promotion test
7fff397
@StrikeForceZero
Restore assertion in ui tracking tests
e43a8e1
@StrikeForceZero
Remove duplicated ContentSize removal handler
bd218c7
@StrikeForceZero
Remove potentially duplicated context update loop
16314de
@StrikeForceZero
Remove demotion logic to simplify scope
2b9bcf8
@StrikeForceZero
Add promotion and demotion handling
207d87c
@StrikeForceZero
fix: rebase on main conflicts
1e4816f
@StrikeForceZero StrikeForceZero force-pushed the dev/bevy_ui/ui_surface_promo_demo branch from 03fb1fa to 1e4816f Compare June 23, 2024 02:50
@StrikeForceZero StrikeForceZero mentioned this pull request Jun 23, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
A-UI Graphical user interfaces, styles, layouts, and widgets C-Bug An unexpected or incorrect behavior S-Waiting-on-Author The author needs to make changes or address concerns before this can be merged
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@StrikeForceZero @alice-i-cecile