diff --git a/crates/bevy_ui/src/layout/mod.rs b/crates/bevy_ui/src/layout/mod.rs index 39d5e26e0d963..bb83f1f9b3f58 100644 --- a/crates/bevy_ui/src/layout/mod.rs +++ b/crates/bevy_ui/src/layout/mod.rs @@ -373,7 +373,7 @@ mod tests { use crate::{ layout::ui_surface::UiSurface, prelude::*, ui_layout_system, - update::update_ui_context_system, ContentSize, LayoutContext, + update::propagate_ui_target_cameras, ContentSize, LayoutContext, }; // these window dimensions are easy to convert to and from percentage values @@ -404,7 +404,7 @@ mod tests { ( // UI is driven by calculated camera target info, so we need to run the camera system first bevy_render::camera::camera_system, - update_ui_context_system, + propagate_ui_target_cameras, ApplyDeferred, ui_layout_system, mark_dirty_trees, @@ -417,7 +417,7 @@ mod tests { app.configure_sets( PostUpdate, PropagateSet::::default() - .after(update_ui_context_system) + .after(propagate_ui_target_cameras) .before(ui_layout_system), ); @@ -1067,7 +1067,7 @@ mod tests { ( // UI is driven by calculated camera target info, so we need to run the camera system first bevy_render::camera::camera_system, - update_ui_context_system, + propagate_ui_target_cameras, ApplyDeferred, ui_layout_system, ) @@ -1081,7 +1081,7 @@ mod tests { app.configure_sets( PostUpdate, PropagateSet::::default() - .after(update_ui_context_system) + .after(propagate_ui_target_cameras) .before(ui_layout_system), ); diff --git a/crates/bevy_ui/src/lib.rs b/crates/bevy_ui/src/lib.rs index c6eefa8bb8a38..0cab37105fb6a 100644 --- a/crates/bevy_ui/src/lib.rs +++ b/crates/bevy_ui/src/lib.rs @@ -76,7 +76,7 @@ use bevy_transform::TransformSystems; use layout::ui_surface::UiSurface; use stack::ui_stack_system; pub use stack::UiStack; -use update::{update_clipping_system, update_ui_context_system}; +use update::{propagate_ui_target_cameras, update_clipping_system}; /// The basic plugin for Bevy UI #[derive(Default)] @@ -183,7 +183,7 @@ impl Plugin for UiPlugin { app.add_systems( PostUpdate, ( - update_ui_context_system.in_set(UiSystems::Prepare), + propagate_ui_target_cameras.in_set(UiSystems::Prepare), ui_layout_system_config, ui_stack_system .in_set(UiSystems::Stack) diff --git a/crates/bevy_ui/src/update.rs b/crates/bevy_ui/src/update.rs index 0dd7c3871463b..0d3e8bdbfa886 100644 --- a/crates/bevy_ui/src/update.rs +++ b/crates/bevy_ui/src/update.rs @@ -133,7 +133,7 @@ fn update_clipping( } } -pub fn update_ui_context_system( +pub fn propagate_ui_target_cameras( mut commands: Commands, default_ui_camera: DefaultUiCamera, ui_scale: Res, @@ -198,7 +198,7 @@ mod tests { use bevy_window::WindowResolution; use bevy_window::WindowScaleFactorChanged; - use crate::update::update_ui_context_system; + use crate::update::propagate_ui_target_cameras; use crate::ComputedUiTargetCamera; use crate::IsDefaultUiCamera; use crate::Node; @@ -228,7 +228,11 @@ mod tests { app.add_systems( bevy_app::Update, - (bevy_render::camera::camera_system, update_ui_context_system).chain(), + ( + bevy_render::camera::camera_system, + propagate_ui_target_cameras, + ) + .chain(), ); app diff --git a/release-content/migration-guides/renamed_computednodetarget.md b/release-content/migration-guides/renamed_computednodetarget.md index 757658066675c..647a0ebed9896 100644 --- a/release-content/migration-guides/renamed_computednodetarget.md +++ b/release-content/migration-guides/renamed_computednodetarget.md @@ -1,6 +1,8 @@ --- -title: Renamed `ComputedNodeTarget` to `ComputedUiTargetCamera` -pull_requests: [20519] +title: Renamed `ComputedNodeTarget` and `update_ui_context_system` +pull_requests: [20519, 20532] --- -Rename `ComputedNodeTarget` to `ComputedUiTargetCamera`. New name chosen because the component's value is derived from `UiTargetCamera`. +`ComputedNodeTarget` has been renamed to `ComputedUiTargetCamera`. New name chosen because the component's value is derived from `UiTargetCamera`. + +`update_ui_context_system` has been renamed to `propagate_ui_target_cameras`.