summaryrefslogtreecommitdiff
path: root/scene/gui
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2016-07-01 11:42:09 -0300
committerJuan Linietsky <reduzio@gmail.com>2016-07-01 11:42:09 -0300
commitec94dd7eeebb218c51baedb1e63c02e77f8a2c9a (patch)
treed2861c859f6839121350749082c4d9c7446e0ea3 /scene/gui
parent8cbb154466c4555f8ea44ebb9ea98f8a0e4c9877 (diff)
Fixed the order of input, reverts #4384, closes #5361
Diffstat (limited to 'scene/gui')
-rw-r--r--scene/gui/base_button.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/gui/base_button.cpp b/scene/gui/base_button.cpp
index a2b7cd2e0a..699062fee4 100644
--- a/scene/gui/base_button.cpp
+++ b/scene/gui/base_button.cpp
@@ -416,7 +416,7 @@ Ref<ShortCut> BaseButton:: get_shortcut() const {
void BaseButton::_unhandled_input(InputEvent p_event) {
- if (!is_disabled() && is_visible() && shortcut.is_valid() && shortcut->is_shortcut(p_event)) {
+ if (!is_disabled() && is_visible() && p_event.is_pressed() && shortcut.is_valid() && shortcut->is_shortcut(p_event)) {
if (get_viewport()->get_modal_stack_top() && !get_viewport()->get_modal_stack_top()->is_a_parent_of(this))
return; //ignore because of modal window