Merge pull request #22198 from DualMatrix/input_was_eaten

Fixed ctrl+up/down shortcut no longer working in scene tree
This commit is contained in:
Rémi Verschelde 2018-09-20 15:54:54 +02:00 committed by GitHub
commit 561a7772c6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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();