Skip to content

Commit 7c5a1c3

Browse files
authored
Fix some UI widgets accidentally being ambiguous with recomputing the ComputedNode::stack_index, which is not used. (#23854)
# Objective - Resolves 2 "strict ambiguities" from #23843. ## Solution - Make these two widget systems ambiguous with the Stack stage. - This only contains the ui_stack_system which only updates the stack_index of the `ComputedNode`, which is unused by these systems. So we don't care about order here. ## Testing - Fixes the ambiguities in #23846.
1 parent 4c7e99c commit 7c5a1c3

2 files changed

Lines changed: 6 additions & 0 deletions

File tree

crates/bevy_ui_widgets/src/popover.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,9 @@ impl Plugin for PopoverPlugin {
311311
PostUpdate,
312312
position_popover
313313
.in_set(UiSystems::Layout)
314+
// The Stack systems just modify the stack_index of ComputedNode, which this system
315+
// doesn't use.
316+
.ambiguous_with(UiSystems::Stack)
314317
.after(ui_layout_system)
315318
.before(update_scrollbar_thumb),
316319
);

crates/bevy_ui_widgets/src/scrollbar.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -462,6 +462,9 @@ impl Plugin for ScrollbarPlugin {
462462
PostUpdate,
463463
update_scrollbar_thumb
464464
.in_set(UiSystems::Layout)
465+
// The Stack systems just modify the stack_index of ComputedNode, which this
466+
// system doesn't use.
467+
.ambiguous_with(UiSystems::Stack)
465468
.after(ui_layout_system),
466469
);
467470
}

0 commit comments

Comments
 (0)