diff options
| author | Ignacio Etcheverry <ignalfonsore@gmail.com> | 2016-07-15 21:22:01 +0200 |
|---|---|---|
| committer | Ignacio Etcheverry <ignalfonsore@gmail.com> | 2016-07-21 03:28:41 +0200 |
| commit | 4e82f9ffcf8531b0065699b9eb03c823504ab271 (patch) | |
| tree | 7e84f1423ef388c4385ebdf8e3093098cf2b853c /scene/gui | |
| parent | 4c4ab140b4569f2700517a13b20127eb7542b3ec (diff) | |
Implement missing ShortCuts in CanvasItemEditor
Diffstat (limited to 'scene/gui')
| -rw-r--r-- | scene/gui/base_button.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/gui/base_button.cpp b/scene/gui/base_button.cpp index 699062fee4..41d766c1b7 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() && p_event.is_pressed() && shortcut.is_valid() && shortcut->is_shortcut(p_event)) { + if (!is_disabled() && is_visible() && p_event.is_pressed() && !p_event.is_echo() && 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 |