
# Objective Now that #13432 has been merged, it's important we update our reflected types to properly opt into this feature. If we do not, then this could cause issues for users downstream who want to make use of reflection-based cloning. ## Solution This PR is broken into 4 commits: 1. Add `#[reflect(Clone)]` on all types marked `#[reflect(opaque)]` that are also `Clone`. This is mandatory as these types would otherwise cause the cloning operation to fail for any type that contains it at any depth. 2. Update the reflection example to suggest adding `#[reflect(Clone)]` on opaque types. 3. Add `#[reflect(clone)]` attributes on all fields marked `#[reflect(ignore)]` that are also `Clone`. This prevents the ignored field from causing the cloning operation to fail. Note that some of the types that contain these fields are also `Clone`, and thus can be marked `#[reflect(Clone)]`. This makes the `#[reflect(clone)]` attribute redundant. However, I think it's safer to keep it marked in the case that the `Clone` impl/derive is ever removed. I'm open to removing them, though, if people disagree. 4. Finally, I added `#[reflect(Clone)]` on all types that are also `Clone`. While not strictly necessary, it enables us to reduce the generated output since we can just call `Clone::clone` directly instead of calling `PartialReflect::reflect_clone` on each variant/field. It also means we benefit from any optimizations or customizations made in the `Clone` impl, including directly dereferencing `Copy` values and increasing reference counters. Along with that change I also took the liberty of adding any missing registrations that I saw could be applied to the type as well, such as `Default`, `PartialEq`, and `Hash`. There were hundreds of these to edit, though, so it's possible I missed quite a few. That last commit is **_massive_**. There were nearly 700 types to update. So it's recommended to review the first three before moving onto that last one. Additionally, I can break the last commit off into its own PR or into smaller PRs, but I figured this would be the easiest way of doing it (and in a timely manner since I unfortunately don't have as much time as I used to for code contributions). ## Testing You can test locally with a `cargo check`: ``` cargo check --workspace --all-features ```
156 lines
4.7 KiB
Rust
156 lines
4.7 KiB
Rust
#![forbid(unsafe_code)]
|
|
#![cfg_attr(docsrs, feature(doc_auto_cfg))]
|
|
#![doc(
|
|
html_logo_url = "https://bevyengine.org/assets/icon.png",
|
|
html_favicon_url = "https://bevyengine.org/assets/icon.png"
|
|
)]
|
|
#![no_std]
|
|
|
|
//! Accessibility for Bevy
|
|
//!
|
|
//! As of Bevy version 0.15 `accesskit` is no longer re-exported from this crate.
|
|
//!
|
|
//! If you need to use `accesskit`, you will need to add it as a separate dependency in your `Cargo.toml`.
|
|
//!
|
|
//! Make sure to use the same version of `accesskit` as Bevy.
|
|
|
|
#[cfg(feature = "std")]
|
|
extern crate std;
|
|
|
|
extern crate alloc;
|
|
|
|
use alloc::sync::Arc;
|
|
use core::sync::atomic::{AtomicBool, Ordering};
|
|
|
|
use accesskit::Node;
|
|
use bevy_app::Plugin;
|
|
use bevy_derive::{Deref, DerefMut};
|
|
use bevy_ecs::{
|
|
prelude::{Component, Event},
|
|
resource::Resource,
|
|
schedule::SystemSet,
|
|
};
|
|
|
|
#[cfg(feature = "bevy_reflect")]
|
|
use {
|
|
bevy_ecs::reflect::ReflectResource, bevy_reflect::std_traits::ReflectDefault,
|
|
bevy_reflect::Reflect,
|
|
};
|
|
|
|
#[cfg(feature = "serialize")]
|
|
use serde::{Deserialize, Serialize};
|
|
|
|
#[cfg(all(feature = "bevy_reflect", feature = "serialize"))]
|
|
use bevy_reflect::{ReflectDeserialize, ReflectSerialize};
|
|
|
|
/// Wrapper struct for [`accesskit::ActionRequest`]. Required to allow it to be used as an `Event`.
|
|
#[derive(Event, Deref, DerefMut)]
|
|
#[cfg_attr(feature = "serialize", derive(Serialize, Deserialize))]
|
|
pub struct ActionRequest(pub accesskit::ActionRequest);
|
|
|
|
/// Resource that tracks whether an assistive technology has requested
|
|
/// accessibility information.
|
|
///
|
|
/// Useful if a third-party plugin needs to conditionally integrate with
|
|
/// `AccessKit`
|
|
#[derive(Resource, Default, Clone, Debug, Deref, DerefMut)]
|
|
#[cfg_attr(
|
|
feature = "bevy_reflect",
|
|
derive(Reflect),
|
|
reflect(Default, Clone, Resource)
|
|
)]
|
|
pub struct AccessibilityRequested(Arc<AtomicBool>);
|
|
|
|
impl AccessibilityRequested {
|
|
/// Returns `true` if an access technology is active and accessibility tree
|
|
/// updates should be sent.
|
|
pub fn get(&self) -> bool {
|
|
self.load(Ordering::SeqCst)
|
|
}
|
|
|
|
/// Sets whether accessibility updates were requested by an access technology.
|
|
pub fn set(&self, value: bool) {
|
|
self.store(value, Ordering::SeqCst);
|
|
}
|
|
}
|
|
|
|
/// Resource whose value determines whether the accessibility tree is updated
|
|
/// via the ECS.
|
|
///
|
|
/// Set to `false` in cases where an external GUI library is sending
|
|
/// accessibility updates instead. Without this, the external library and ECS
|
|
/// will generate conflicting updates.
|
|
#[derive(Resource, Clone, Debug, Deref, DerefMut)]
|
|
#[cfg_attr(feature = "serialize", derive(Serialize, Deserialize))]
|
|
#[cfg_attr(
|
|
feature = "bevy_reflect",
|
|
derive(Reflect),
|
|
reflect(Resource, Clone, Default)
|
|
)]
|
|
#[cfg_attr(
|
|
all(feature = "bevy_reflect", feature = "serialize"),
|
|
reflect(Serialize, Deserialize)
|
|
)]
|
|
pub struct ManageAccessibilityUpdates(bool);
|
|
|
|
impl Default for ManageAccessibilityUpdates {
|
|
fn default() -> Self {
|
|
Self(true)
|
|
}
|
|
}
|
|
|
|
impl ManageAccessibilityUpdates {
|
|
/// Returns `true` if the ECS should update the accessibility tree.
|
|
pub fn get(&self) -> bool {
|
|
self.0
|
|
}
|
|
|
|
/// Sets whether the ECS should update the accessibility tree.
|
|
pub fn set(&mut self, value: bool) {
|
|
self.0 = value;
|
|
}
|
|
}
|
|
|
|
/// Component to wrap a [`accesskit::Node`], representing this entity to the platform's
|
|
/// accessibility API.
|
|
///
|
|
/// If an entity has a parent, and that parent also has an `AccessibilityNode`,
|
|
/// the entity's node will be a child of the parent's node.
|
|
///
|
|
/// If the entity doesn't have a parent, or if the immediate parent doesn't have
|
|
/// an `AccessibilityNode`, its node will be an immediate child of the primary window.
|
|
#[derive(Component, Clone, Deref, DerefMut)]
|
|
#[cfg_attr(feature = "serialize", derive(Serialize, Deserialize))]
|
|
pub struct AccessibilityNode(pub Node);
|
|
|
|
impl From<Node> for AccessibilityNode {
|
|
fn from(node: Node) -> Self {
|
|
Self(node)
|
|
}
|
|
}
|
|
|
|
/// Set enum for the systems relating to accessibility
|
|
#[derive(Debug, Hash, PartialEq, Eq, Clone, SystemSet)]
|
|
#[cfg_attr(feature = "serialize", derive(Serialize, Deserialize))]
|
|
#[cfg_attr(feature = "bevy_reflect", derive(Reflect))]
|
|
#[cfg_attr(
|
|
all(feature = "bevy_reflect", feature = "serialize"),
|
|
reflect(Serialize, Deserialize, Clone)
|
|
)]
|
|
pub enum AccessibilitySystem {
|
|
/// Update the accessibility tree
|
|
Update,
|
|
}
|
|
|
|
/// Plugin managing non-GUI aspects of integrating with accessibility APIs.
|
|
#[derive(Default)]
|
|
pub struct AccessibilityPlugin;
|
|
|
|
impl Plugin for AccessibilityPlugin {
|
|
fn build(&self, app: &mut bevy_app::App) {
|
|
app.init_resource::<AccessibilityRequested>()
|
|
.init_resource::<ManageAccessibilityUpdates>()
|
|
.allow_ambiguous_component::<AccessibilityNode>();
|
|
}
|
|
}
|