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

Jump to bottom

Allow AccessKit to react to WindowEvents before they reach the engine #10356

Merged
merged 7 commits into from Nov 3, 2023
Merged

Allow AccessKit to react to WindowEvents before they reach the engine #10356

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fe2904f
Allow AccessKit to filter `WindowEvent`s before they reach the engine.
ndarilek Oct 23, 2023
8c437cd
Rename created_windows_query to avoid ambiguity
Oct 23, 2023
52ec918
Revert "Rename created_windows_query to avoid ambiguity"
Oct 23, 2023
11ba76b
Fix borrow checking problem
Oct 23, 2023
5a4fd9b
Don't filter events from AccessKit (yet)
alice-i-cecile Oct 29, 2023
05ad755
rustfmt
ndarilek Nov 3, 2023
9f1994f
fix error
mockersf Nov 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 17 additions & 4 deletions crates/bevy_winit/src/lib.rs
View file
Open in desktop
Expand Up @@ -372,6 +372,7 @@ pub fn winit_runner(mut app: App) {
WindowAndInputEventWriters,
NonSend<WinitWindows>,
Query<(&mut Window, &mut CachedWindow)>,
NonSend<AccessKitAdapters>,
)> = SystemState::new(&mut app.world);

#[cfg(not(target_arch = "wasm32"))]
Expand Down Expand Up @@ -476,7 +477,7 @@ pub fn winit_runner(mut app: App) {
event::Event::WindowEvent {
event, window_id, ..
} => {
let (mut event_writers, winit_windows, mut windows) =
let (mut event_writers, winit_windows, mut windows, access_kit_adapters) =
event_writer_system_state.get_mut(&mut app.world);

let Some(window_entity) = winit_windows.get_window_entity(window_id) else {
Expand All @@ -495,6 +496,18 @@ pub fn winit_runner(mut app: App) {
return;
};

// Allow AccessKit to respond to `WindowEvent`s before they reach
// the engine.
if let Some(adapter) = access_kit_adapters.get(&window_entity) {
if let Some(window) = winit_windows.get_window(window_entity) {
// Somewhat surprisingly, this call has meaningful side effects
// See https://github.com/AccessKit/accesskit/issues/300
// AccessKit might later need to filter events based on this, but we currently do not.
// See https://github.com/bevyengine/bevy/pull/10239#issuecomment-1775572176
let _ = adapter.on_event(window, &event);
}
}

runner_state.window_event_received = true;

match event {
Expand Down Expand Up @@ -713,20 +726,20 @@ pub fn winit_runner(mut app: App) {
event: DeviceEvent::MouseMotion { delta: (x, y) },
..
} => {
let (mut event_writers, _, _) = event_writer_system_state.get_mut(&mut app.world);
let (mut event_writers, ..) = event_writer_system_state.get_mut(&mut app.world);
event_writers.mouse_motion.send(MouseMotion {
delta: Vec2::new(x as f32, y as f32),
});
}
event::Event::Suspended => {
let (mut event_writers, _, _) = event_writer_system_state.get_mut(&mut app.world);
let (mut event_writers, ..) = event_writer_system_state.get_mut(&mut app.world);
event_writers.lifetime.send(ApplicationLifetime::Suspended);
// Mark the state as `WillSuspend`. This will let the schedule run one last time
// before actually suspending to let the application react
runner_state.active = ActiveState::WillSuspend;
}
event::Event::Resumed => {
let (mut event_writers, _, _) = event_writer_system_state.get_mut(&mut app.world);
let (mut event_writers, ..) = event_writer_system_state.get_mut(&mut app.world);
match runner_state.active {
ActiveState::NotYetStarted => {
event_writers.lifetime.send(ApplicationLifetime::Started);
Expand Down