summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2023-08-14 09:38:08 +0200
committerRémi Verschelde <rverschelde@gmail.com>2023-08-14 09:38:08 +0200
commit0308422f461dce11339896249e23ff02d978bfa0 (patch)
treebfcbb2e27cb35f9b180bddc04739b4b3415cdfe5
parent122f3730ca28654c173ba4c26c9a0e96909433f6 (diff)
parentf0927250ca0c37fbdb32075bb20d667cc6972e4c (diff)
downloadredot-engine-0308422f461dce11339896249e23ff02d978bfa0.tar.gz
Merge pull request #80594 from rsubtil/fix_window_input_event
Support other input methods on Popup/Dialogs' `_input_from_window`
-rw-r--r--scene/gui/dialogs.cpp3
-rw-r--r--scene/gui/popup.cpp3
2 files changed, 2 insertions, 4 deletions
diff --git a/scene/gui/dialogs.cpp b/scene/gui/dialogs.cpp
index 4f94f0d9f2..6e75be268d 100644
--- a/scene/gui/dialogs.cpp
+++ b/scene/gui/dialogs.cpp
@@ -38,8 +38,7 @@
// AcceptDialog
void AcceptDialog::_input_from_window(const Ref<InputEvent> &p_event) {
- Ref<InputEventKey> key = p_event;
- if (close_on_escape && key.is_valid() && key->is_action_pressed(SNAME("ui_cancel"), false, true)) {
+ if (close_on_escape && p_event->is_action_pressed(SNAME("ui_cancel"), false, true)) {
_cancel_pressed();
}
}
diff --git a/scene/gui/popup.cpp b/scene/gui/popup.cpp
index c0a2dc81d0..6915f3d242 100644
--- a/scene/gui/popup.cpp
+++ b/scene/gui/popup.cpp
@@ -35,8 +35,7 @@
#include "scene/gui/panel.h"
void Popup::_input_from_window(const Ref<InputEvent> &p_event) {
- Ref<InputEventKey> key = p_event;
- if (get_flag(FLAG_POPUP) && key.is_valid() && key->is_action_pressed(SNAME("ui_cancel"), false, true)) {
+ if (get_flag(FLAG_POPUP) && p_event->is_action_pressed(SNAME("ui_cancel"), false, true)) {
_close_pressed();
}
}