Skip to content

Commit

Permalink
[Tree] Improve navigation with row select mode
Browse files Browse the repository at this point in the history
Allows navigating with the `ui_left/right` actions when selecting rows,
fixing a navigation inconsistency
  • Loading branch information
AThousandShips committed Aug 28, 2024
1 parent f648de1 commit 5c21c0d
Showing 1 changed file with 13 additions and 5 deletions.
18 changes: 13 additions & 5 deletions scene/gui/tree.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3468,29 +3468,37 @@ void Tree::gui_input(const Ref<InputEvent> &p_event) {
accept_event();
}

if (!selected_item || select_mode == SELECT_ROW || selected_col > (columns.size() - 1)) {
if (!selected_item || selected_col > (columns.size() - 1)) {
return;
}

if (k.is_valid() && k->is_shift_pressed()) {
selected_item->set_collapsed_recursive(false);
} else {
} else if (select_mode != SELECT_ROW) {
_go_right();
} else if (selected_item->get_first_child() != nullptr && selected_item->is_collapsed()) {
selected_item->set_collapsed(false);
} else {
_go_down();
}
} else if (p_event->is_action("ui_left") && p_event->is_pressed()) {
if (!cursor_can_exit_tree) {
accept_event();
}

if (!selected_item || select_mode == SELECT_ROW || selected_col < 0) {
if (!selected_item || selected_col < 0) {
return;
}

if (k.is_valid() && k->is_shift_pressed()) {
selected_item->set_collapsed_recursive(true);
} else {
} else if (select_mode != SELECT_ROW) {
_go_left();
} else if (selected_item->get_first_child() != nullptr && !selected_item->is_collapsed()) {
selected_item->set_collapsed(true);
} else {
_go_up();
}

} else if (p_event->is_action("ui_up") && p_event->is_pressed() && !is_command) {
if (!cursor_can_exit_tree) {
accept_event();
Expand Down

0 comments on commit 5c21c0d

Please sign in to comment.