
- ignore all ambiguities that are not a problem - remove `.before(Assets::<Image>::track_assets),` that points into a different schedule (-> should this be caught?) - add some explicit orderings: - run `poll_receivers` and `update_accessibility_nodes` after `window_closed` in `bevy_winit::accessibility` - run `bevy_ui::accessibility::calc_bounds` after `CameraUpdateSystem` - run ` bevy_text::update_text2d_layout` and `bevy_ui::text_system` after `font_atlas_set::remove_dropped_font_atlas_sets` - add `app.ignore_ambiguity(a, b)` function for cases where you want to ignore an ambiguity between two independent plugins `A` and `B` - add `IgnoreAmbiguitiesPlugin` in `DefaultPlugins` that allows cross-crate ambiguities like `bevy_animation`/`bevy_ui` - Fixes https://github.com/bevyengine/bevy/issues/9511 ## Before **Render**  **PostUpdate**  ## After **Render**  **PostUpdate**  --------- Co-authored-by: Alice Cecile <alice.i.cecile@gmail.com> Co-authored-by: Alice Cecile <alice.i.cecil@gmail.com> Co-authored-by: François <mockersf@gmail.com>
166 lines
5.1 KiB
Rust
166 lines
5.1 KiB
Rust
use crate::{
|
|
prelude::{Button, Label},
|
|
Node, UiImage,
|
|
};
|
|
use bevy_a11y::{
|
|
accesskit::{NodeBuilder, Rect, Role},
|
|
AccessibilityNode,
|
|
};
|
|
use bevy_app::{App, Plugin, PostUpdate};
|
|
use bevy_ecs::{
|
|
prelude::{DetectChanges, Entity},
|
|
query::{Changed, Without},
|
|
schedule::IntoSystemConfigs,
|
|
system::{Commands, Query},
|
|
world::Ref,
|
|
};
|
|
use bevy_hierarchy::Children;
|
|
use bevy_render::{camera::CameraUpdateSystem, prelude::Camera};
|
|
use bevy_text::Text;
|
|
use bevy_transform::prelude::GlobalTransform;
|
|
|
|
fn calc_name(texts: &Query<&Text>, children: &Children) -> Option<Box<str>> {
|
|
let mut name = None;
|
|
for child in children {
|
|
if let Ok(text) = texts.get(*child) {
|
|
let values = text
|
|
.sections
|
|
.iter()
|
|
.map(|v| v.value.to_string())
|
|
.collect::<Vec<String>>();
|
|
name = Some(values.join(" "));
|
|
}
|
|
}
|
|
name.map(|v| v.into_boxed_str())
|
|
}
|
|
|
|
fn calc_bounds(
|
|
camera: Query<(&Camera, &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 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);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
fn button_changed(
|
|
mut commands: Commands,
|
|
mut query: Query<(Entity, &Children, Option<&mut AccessibilityNode>), Changed<Button>>,
|
|
texts: Query<&Text>,
|
|
) {
|
|
for (entity, children, accessible) in &mut query {
|
|
let name = calc_name(&texts, children);
|
|
if let Some(mut accessible) = accessible {
|
|
accessible.set_role(Role::Button);
|
|
if let Some(name) = name {
|
|
accessible.set_name(name);
|
|
} else {
|
|
accessible.clear_name();
|
|
}
|
|
} else {
|
|
let mut node = NodeBuilder::new(Role::Button);
|
|
if let Some(name) = name {
|
|
node.set_name(name);
|
|
}
|
|
commands
|
|
.entity(entity)
|
|
.insert(AccessibilityNode::from(node));
|
|
}
|
|
}
|
|
}
|
|
|
|
fn image_changed(
|
|
mut commands: Commands,
|
|
mut query: Query<
|
|
(Entity, &Children, Option<&mut AccessibilityNode>),
|
|
(Changed<UiImage>, Without<Button>),
|
|
>,
|
|
texts: Query<&Text>,
|
|
) {
|
|
for (entity, children, accessible) in &mut query {
|
|
let name = calc_name(&texts, children);
|
|
if let Some(mut accessible) = accessible {
|
|
accessible.set_role(Role::Image);
|
|
if let Some(name) = name {
|
|
accessible.set_name(name);
|
|
} else {
|
|
accessible.clear_name();
|
|
}
|
|
} else {
|
|
let mut node = NodeBuilder::new(Role::Image);
|
|
if let Some(name) = name {
|
|
node.set_name(name);
|
|
}
|
|
commands
|
|
.entity(entity)
|
|
.insert(AccessibilityNode::from(node));
|
|
}
|
|
}
|
|
}
|
|
|
|
fn label_changed(
|
|
mut commands: Commands,
|
|
mut query: Query<(Entity, &Text, Option<&mut AccessibilityNode>), Changed<Label>>,
|
|
) {
|
|
for (entity, text, accessible) in &mut query {
|
|
let values = text
|
|
.sections
|
|
.iter()
|
|
.map(|v| v.value.to_string())
|
|
.collect::<Vec<String>>();
|
|
let name = Some(values.join(" ").into_boxed_str());
|
|
if let Some(mut accessible) = accessible {
|
|
accessible.set_role(Role::StaticText);
|
|
if let Some(name) = name {
|
|
accessible.set_name(name);
|
|
} else {
|
|
accessible.clear_name();
|
|
}
|
|
} else {
|
|
let mut node = NodeBuilder::new(Role::StaticText);
|
|
if let Some(name) = name {
|
|
node.set_name(name);
|
|
}
|
|
commands
|
|
.entity(entity)
|
|
.insert(AccessibilityNode::from(node));
|
|
}
|
|
}
|
|
}
|
|
|
|
/// `AccessKit` integration for `bevy_ui`.
|
|
pub(crate) struct AccessibilityPlugin;
|
|
|
|
impl Plugin for AccessibilityPlugin {
|
|
fn build(&self, app: &mut App) {
|
|
app.add_systems(
|
|
PostUpdate,
|
|
(
|
|
calc_bounds
|
|
.after(bevy_transform::TransformSystem::TransformPropagate)
|
|
.after(CameraUpdateSystem)
|
|
// the listed systems do not affect calculated size
|
|
.ambiguous_with(crate::resolve_outlines_system)
|
|
.ambiguous_with(crate::ui_stack_system),
|
|
button_changed,
|
|
image_changed,
|
|
label_changed,
|
|
),
|
|
);
|
|
}
|
|
}
|