godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Editor] Fix editor progress dialog auto closing on ESC press, and on application focus loss.

Browse Source
This commit is contained in:
bruvzg 2023-02-14 09:23:40 +02:00
parent 4848877b80
commit 39b69e6f76
No known key found for this signature in database
GPG Key ID: 7960FCF39844EC38
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
scene/gui/popup.cpp
View File

@ -36,7 +36,7 @@
void Popup::_input_from_window(const Ref<InputEvent> &p_event) { void Popup::_input_from_window(const Ref<InputEvent> &p_event) {
Ref<InputEventKey> key = p_event; Ref<InputEventKey> key = p_event;
if (key.is_valid() && key->is_pressed() && key->get_keycode() == Key::ESCAPE) { if (get_flag(FLAG_POPUP) && key.is_valid() && key->is_pressed() && key->get_keycode() == Key::ESCAPE) {
_close_pressed(); _close_pressed();
} }
} }
@ -102,12 +102,17 @@ void Popup::_notification(int p_what) {
} }
} break; } break;
case NOTIFICATION_WM_CLOSE_REQUEST: case NOTIFICATION_WM_CLOSE_REQUEST: {
case NOTIFICATION_APPLICATION_FOCUS_OUT: {
if (!is_in_edited_scene_root()) { if (!is_in_edited_scene_root()) {
_close_pressed(); _close_pressed();
} }
} break; } break;
case NOTIFICATION_APPLICATION_FOCUS_OUT: {
if (!is_in_edited_scene_root() && get_flag(FLAG_POPUP)) {
_close_pressed();
}
} break;
} }
} }