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

Fix panic when the primary window is closed (#6545)

Browse Source 
Issue introduced by #6533.

Co-authored-by: devil-ira <justthecooldude@gmail.com>
This commit is contained in:
ira 2022-11-12 01:28:31 +00:00
parent 4ef192b91a
commit 7ced5336e6
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
crates/bevy_ui/src/focus.rs
View File

@ -124,11 +124,14 @@ pub fn ui_focus_system(
}) })
.filter_map(|window_id| windows.get(window_id)) .filter_map(|window_id| windows.get(window_id))
.filter(|window| window.is_focused()) .filter(|window| window.is_focused())
.find_map(|window| window.cursor_position()) .find_map(|window| {
window.cursor_position().map(|mut cursor_pos| {
cursor_pos.y = window.height() - cursor_pos.y;
cursor_pos
})
})
.or_else(|| touches_input.first_pressed_position()); .or_else(|| touches_input.first_pressed_position());
let window_height = windows.primary().height();
// prepare an iterator that contains all the nodes that have the cursor in their rect, // prepare an iterator that contains all the nodes that have the cursor in their rect,
// from the top node to the bottom one. this will also reset the interaction to `None` // from the top node to the bottom one. this will also reset the interaction to `None`
// for all nodes encountered that are no longer hovered. // for all nodes encountered that are no longer hovered.
@ -167,7 +170,7 @@ pub fn ui_focus_system(
// clicking // clicking
let contains_cursor = if let Some(cursor_position) = cursor_position { let contains_cursor = if let Some(cursor_position) = cursor_position {
(min.x..max.x).contains(&cursor_position.x) (min.x..max.x).contains(&cursor_position.x)
&& (min.y..max.y).contains(&(window_height - cursor_position.y)) && (min.y..max.y).contains(&cursor_position.y)
} else { } else {
false false
}; };