diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2023-02-14 11:06:16 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-02-14 11:06:16 +0100 |
| commit | 78ccf71dfb996eda3d40e08a5be8f36f2de92b32 (patch) | |
| tree | 0e1e72704fd0b2b0cb49c8e94176e773c64b4418 | |
| parent | 570b04dec4adfb1f55a168cfae99768308bab506 (diff) | |
| parent | 39b69e6f7622d44064c525e95d48892fb2ff3f9a (diff) | |
Merge pull request #73269 from bruvzg/ed_prog2
[Editor] Fix editor progress dialog auto closing on ESC press, and on application focus loss.
| -rw-r--r-- | scene/gui/popup.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/scene/gui/popup.cpp b/scene/gui/popup.cpp index 2ea1b93810..432004dedc 100644 --- a/scene/gui/popup.cpp +++ b/scene/gui/popup.cpp @@ -36,7 +36,7 @@ void Popup::_input_from_window(const Ref<InputEvent> &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(); } } @@ -102,12 +102,17 @@ void Popup::_notification(int p_what) { } } break; - case NOTIFICATION_WM_CLOSE_REQUEST: - case NOTIFICATION_APPLICATION_FOCUS_OUT: { + case NOTIFICATION_WM_CLOSE_REQUEST: { if (!is_in_edited_scene_root()) { _close_pressed(); } } break; + + case NOTIFICATION_APPLICATION_FOCUS_OUT: { + if (!is_in_edited_scene_root() && get_flag(FLAG_POPUP)) { + _close_pressed(); + } + } break; } } |