diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-09-20 15:54:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-20 15:54:54 +0200 |
| commit | 561a7772c628d0cf36bd925d68a98a767758345b (patch) | |
| tree | 0173d1df53bf3004852335dd4661b358dd6aedae /scene | |
| parent | 9136f1287e75a0232c54caa32a917bd146ced81b (diff) | |
| parent | f8ead1a2ee29b6958bf8be0dc569f397a9cff131 (diff) | |
Merge pull request #22198 from DualMatrix/input_was_eaten
Fixed ctrl+up/down shortcut no longer working in scene tree
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/gui/tree.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/gui/tree.cpp b/scene/gui/tree.cpp index 365a6a5cae..24b9083964 100644 --- a/scene/gui/tree.cpp +++ b/scene/gui/tree.cpp @@ -2239,13 +2239,13 @@ void Tree::_gui_input(Ref<InputEvent> p_event) { _go_left(); } - } else if (p_event->is_action("ui_up") && p_event->is_pressed()) { + } else if (p_event->is_action("ui_up") && p_event->is_pressed() && !k->get_command()) { if (!cursor_can_exit_tree) accept_event(); _go_up(); - } else if (p_event->is_action("ui_down") && p_event->is_pressed()) { + } else if (p_event->is_action("ui_down") && p_event->is_pressed() && !k->get_command()) { if (!cursor_can_exit_tree) accept_event(); |