godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Merge pull request #100637 from bruvzg/unset_fw 

Unset last focused window when it is destroyed.
This commit is contained in:
Rémi Verschelde 2024-12-20 23:57:13 +01:00
parent fd5548a8b7 73faa509ea
commit eaed664bce
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
platform/linuxbsd/x11/display_server_x11.cpp
View File

@ -1875,6 +1875,10 @@ void DisplayServerX11::delete_sub_window(WindowID p_id) {
window_set_drop_files_callback(Callable(), p_id); window_set_drop_files_callback(Callable(), p_id);
windows.erase(p_id); windows.erase(p_id);
if (last_focused_window == p_id) {
last_focused_window = INVALID_WINDOW_ID;
}
} }
int64_t DisplayServerX11::window_get_native_handle(HandleType p_handle_type, WindowID p_window) const { int64_t DisplayServerX11::window_get_native_handle(HandleType p_handle_type, WindowID p_window) const {

4
platform/macos/display_server_macos.mm
View File

@ -733,6 +733,10 @@ void DisplayServerMacOS::window_destroy(WindowID p_window) {
} }
#endif #endif
windows.erase(p_window); windows.erase(p_window);
if (last_focused_window == p_window) {
last_focused_window = INVALID_WINDOW_ID;
}
update_presentation_mode(); update_presentation_mode();
} }