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

Replace remaining uses of &T, Changed<T> with Ref in UI system queries #8567

Merged
merged 4 commits into from
May 8, 2023
Merged

Replace remaining uses of &T, Changed<T> with Ref in UI system queries #8567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
653b748
Replaced use of `Changed` with `Ref` in queries in the `ui_layout_sy…
ickshonpe May 7, 2023
93e587d
fixed imports
ickshonpe May 7, 2023
286483d
fixed imports
ickshonpe May 7, 2023
b8df6c6
cargo fmt
ickshonpe May 7, 2023
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
32 changes: 16 additions & 16 deletions crates/bevy_ui/src/accessibility.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@ use bevy_a11y::{
};
use bevy_app::{App, Plugin, Update};
use bevy_ecs::{
prelude::Entity,
query::{Changed, Or, Without},
prelude::{DetectChanges, Entity},
query::{Changed, Without},
system::{Commands, Query},
world::Ref,
};
use bevy_hierarchy::Children;
use bevy_render::prelude::Camera;
Expand All @@ -34,23 +35,22 @@ fn calc_name(texts: &Query<&Text>, children: &Children) -> Option<Box<str>> {

fn calc_bounds(
camera: Query<(&Camera, &GlobalTransform)>,
mut nodes: Query<
(&mut AccessibilityNode, &Node, &GlobalTransform),
Or<(Changed<Node>, Changed<GlobalTransform>)>,
>,
mut nodes: Query<(&mut AccessibilityNode, Ref<Node>, Ref<GlobalTransform>)>,
) {
if let Ok((camera, camera_transform)) = camera.get_single() {
for (mut accessible, node, transform) in &mut nodes {
if let Some(translation) =
camera.world_to_viewport(camera_transform, transform.translation())
{
let bounds = Rect::new(
translation.x.into(),
translation.y.into(),
(translation.x + node.calculated_size.x).into(),
(translation.y + node.calculated_size.y).into(),
);
accessible.set_bounds(bounds);
if node.is_changed() || transform.is_changed() {
if let Some(translation) =
camera.world_to_viewport(camera_transform, transform.translation())
{
let bounds = Rect::new(
translation.x.into(),
translation.y.into(),
(translation.x + node.calculated_size.x).into(),
(translation.y + node.calculated_size.y).into(),
);
accessible.set_bounds(bounds);
}
}
}
}
Expand Down
8 changes: 5 additions & 3 deletions crates/bevy_ui/src/layout/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use bevy_ecs::{
change_detection::DetectChanges,
entity::Entity,
event::EventReader,
query::{Changed, With, Without},
query::{With, Without},
removal_detection::RemovedComponents,
system::{Query, Res, ResMut, Resource},
world::Ref,
Expand Down Expand Up @@ -221,7 +221,7 @@ pub fn ui_layout_system(
root_node_query: Query<Entity, (With<Node>, Without<Parent>)>,
style_query: Query<(Entity, Ref<Style>), With<Node>>,
mut measure_query: Query<(Entity, &mut ContentSize)>,
children_query: Query<(Entity, &Children), (With<Node>, Changed<Children>)>,
children_query: Query<(Entity, Ref<Children>), With<Node>>,
mut removed_children: RemovedComponents<Children>,
mut removed_content_sizes: RemovedComponents<ContentSize>,
mut node_transform_query: Query<(Entity, &mut Node, &mut Transform, Option<&Parent>)>,
Expand Down Expand Up @@ -292,7 +292,9 @@ pub fn ui_layout_system(
ui_surface.try_remove_children(entity);
}
for (entity, children) in &children_query {
ui_surface.update_children(entity, children);
if children.is_changed() {
ui_surface.update_children(entity, &children);
}
}

// compute layouts
Expand Down