Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crates/bevy_feathers/src/controls/scrollbar.rs
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ impl Plugin for ScrollbarPlugin {
PostUpdate,
update_scrollbar_visibility
.after(UiSystems::Layout)
.before(bevy_ui::update::update_clipping_system)
.before(UiSystems::Clipping)
.ambiguous_with(TransformGizmoRenderStep),
);
}
Expand Down
9 changes: 7 additions & 2 deletions crates/bevy_ui/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,11 @@ pub enum UiSystems {
///
/// Runs in [`PostUpdate`].
Layout,
/// UI systems ordered after [`UiSystems::Layout`].
/// After this, UI clipping has been updated.
///
/// Runs in [`PostUpdate`]
Clipping,
/// UI systems ordered after [`UiSystems::Layout`] and [`UiSystems::Clipping`].
///
/// Runs in [`PostUpdate`].
PostLayout,
Expand Down Expand Up @@ -162,6 +166,7 @@ impl Plugin for UiPlugin {
UiSystems::Propagate,
UiSystems::Content,
UiSystems::Layout,
UiSystems::Clipping,
UiSystems::PostLayout,
)
.chain_weak(),
Expand Down Expand Up @@ -202,7 +207,7 @@ impl Plugin for UiPlugin {
.in_set(UiSystems::Layout)
.ambiguous_with(bevy_sprite::update_text2d_layout),
ui_stack_system.in_set(UiSystems::Stack),
update_clipping_system.in_set(UiSystems::PostLayout),
update_clipping_system.in_set(UiSystems::Clipping),
// Potential conflicts: `Assets<Image>`
// They run independently since `widget::image_node_system` will only ever observe
// its own ImageNode, and `widget::text_system` & `bevy_text::update_text2d_layout`
Expand Down
Loading