diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-07-21 09:02:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-21 09:02:01 +0200 |
| commit | 750b973ee4d022492544d61c3105d46d68af0c60 (patch) | |
| tree | d321674ffb594b01de7b2e6adac321fbb0400437 /scene/gui/base_button.cpp | |
| parent | 33cc480350264e15c12bf82b9198b9967e4313dc (diff) | |
| parent | 4e82f9ffcf8531b0065699b9eb03c823504ab271 (diff) | |
Merge pull request #5200 from neikeq/sc-CanvasItemEditor
Implement ShortCuts in CanvasItemEditor
Diffstat (limited to 'scene/gui/base_button.cpp')
| -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 |