forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add Windows::get_focused(_mut) (#6571)

Browse Source 
Add a method to get the focused window.

Use this instead of `WindowFocused` events in `close_on_esc`.
Seems that the OS/window manager might not always send focused events on application startup.

Sadly, not a fix for #5646.

Co-authored-by: devil-ira <justthecooldude@gmail.com>
This commit is contained in:
ira 2022-11-14 21:59:18 +00:00
parent 5f1261110f
commit 308e092153
3 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
crates/bevy_window/src/system.rs
View File

@ -1,4 +1,4 @@
use crate::{Window, WindowCloseRequested, WindowFocused, WindowId, Windows}; use crate::{Window, WindowCloseRequested, Windows};
use bevy_app::AppExit; use bevy_app::AppExit;
use bevy_ecs::prelude::*; use bevy_ecs::prelude::*;
@ -36,22 +36,10 @@ pub fn close_when_requested(
/// Close the focused window whenever the escape key (<kbd>Esc</kbd>) is pressed /// Close the focused window whenever the escape key (<kbd>Esc</kbd>) is pressed
/// ///
/// This is useful for examples or prototyping. /// This is useful for examples or prototyping.
pub fn close_on_esc( pub fn close_on_esc(mut windows: ResMut<Windows>, input: Res<Input<KeyCode>>) {
mut focused: Local<Option<WindowId>>,
mut focused_events: EventReader<WindowFocused>,
mut windows: ResMut<Windows>,
input: Res<Input<KeyCode>>,
) {
// TODO: Track this in e.g. a resource to ensure consistent behaviour across similar systems
for event in focused_events.iter() {
*focused = event.focused.then_some(event.id);
}
if let Some(focused) = &*focused {
if input.just_pressed(KeyCode::Escape) { if input.just_pressed(KeyCode::Escape) {
if let Some(window) = windows.get_mut(*focused) { if let Some(window) = windows.get_focused_mut() {
window.close(); window.close();
} }
} }
}
} }

2
crates/bevy_window/src/window.rs
View File

@ -432,7 +432,7 @@ impl Window {
cursor_icon: CursorIcon::Default, cursor_icon: CursorIcon::Default,
physical_cursor_position: None, physical_cursor_position: None,
raw_handle, raw_handle,
focused: true, focused: false,
mode: window_descriptor.mode, mode: window_descriptor.mode,
canvas: window_descriptor.canvas.clone(), canvas: window_descriptor.canvas.clone(),
fit_canvas_to_parent: window_descriptor.fit_canvas_to_parent, fit_canvas_to_parent: window_descriptor.fit_canvas_to_parent,

10
crates/bevy_window/src/windows.rs
View File

@ -53,6 +53,16 @@ impl Windows {
.expect("Primary window does not exist") .expect("Primary window does not exist")
} }
/// Get a reference to the focused [`Window`].
pub fn get_focused(&self) -> Option<&Window> {
self.windows.values().find(|window| window.is_focused())
}
/// Get a mutable reference to the focused [`Window`].
pub fn get_focused_mut(&mut self) -> Option<&mut Window> {
self.windows.values_mut().find(|window| window.is_focused())
}
/// Returns the scale factor for the [`Window`] of `id`, or `1.0` if the window does not exist. /// Returns the scale factor for the [`Window`] of `id`, or `1.0` if the window does not exist.
pub fn scale_factor(&self, id: WindowId) -> f64 { pub fn scale_factor(&self, id: WindowId) -> f64 {
if let Some(window) = self.get(id) { if let Some(window) = self.get(id) {