godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

Support controller input on popup/dialogs

Browse Source
This commit is contained in:
Ricardo Subtil
2023-08-03 12:22:03 +01:00
parent 7ba79d68bd
commit f0927250ca
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scene/gui/dialogs.cpp
View File

@@ -38,8 +38,7 @@
// AcceptDialog // AcceptDialog
void AcceptDialog::_input_from_window(const Ref<InputEvent> &p_event) { void AcceptDialog::_input_from_window(const Ref<InputEvent> &p_event) {
Ref<InputEventKey> key = p_event; if (close_on_escape && p_event->is_action_pressed(SNAME("ui_cancel"), false, true)) {
if (close_on_escape && key.is_valid() && key->is_action_pressed(SNAME("ui_cancel"), false, true)) {
_cancel_pressed(); _cancel_pressed();
} }
} }

3
scene/gui/popup.cpp
View File

@@ -35,8 +35,7 @@
#include "scene/gui/panel.h" #include "scene/gui/panel.h"
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; if (get_flag(FLAG_POPUP) && p_event->is_action_pressed(SNAME("ui_cancel"), false, true)) {
if (get_flag(FLAG_POPUP) && key.is_valid() && key->is_action_pressed(SNAME("ui_cancel"), false, true)) {
_close_pressed(); _close_pressed();
} }
} }