Skip to content

Commit

Permalink
Fix panic when the primary window is closed (#6545)
Browse files Browse the repository at this point in the history
Issue introduced by #6533.

Co-authored-by: devil-ira <justthecooldude@gmail.com>
  • Loading branch information
irate-devil and irate-devil committed Nov 12, 2022
1 parent 4ef192b commit 7ced533
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions crates/bevy_ui/src/focus.rs
Expand Up @@ -124,11 +124,14 @@ pub fn ui_focus_system(
})
.filter_map(|window_id| windows.get(window_id))
.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());

let window_height = windows.primary().height();

// 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`
// for all nodes encountered that are no longer hovered.
Expand Down Expand Up @@ -167,7 +170,7 @@ pub fn ui_focus_system(
// clicking
let contains_cursor = if let Some(cursor_position) = cursor_position {
(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 {
false
};
Expand Down

0 comments on commit 7ced533

Please sign in to comment.