asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[Tree] Improve navigation with row select mode

Browse source 
Allows navigating with the `ui_left/right` actions when selecting rows,
fixing a navigation inconsistency
This commit is contained in:
A Thousand Ships 2024-08-28 18:32:45 +02:00
parent f648de1a83
commit 5c21c0d8d3
No known key found for this signature in database
GPG key ID: 2033189A662F8BD7
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
scene/gui/tree.cpp
View file

@ -3468,29 +3468,37 @@ void Tree::gui_input(const Ref<InputEvent> &p_event) {
accept_event(); accept_event();
} }
if (!selected_item || select_mode == SELECT_ROW || selected_col > (columns.size() - 1)) { if (!selected_item || selected_col > (columns.size() - 1)) {
return; return;
} }
if (k.is_valid() && k->is_shift_pressed()) { if (k.is_valid() && k->is_shift_pressed()) {
selected_item->set_collapsed_recursive(false); selected_item->set_collapsed_recursive(false);
} else { } else if (select_mode != SELECT_ROW) {
_go_right(); _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()) { } else if (p_event->is_action("ui_left") && p_event->is_pressed()) {
if (!cursor_can_exit_tree) { if (!cursor_can_exit_tree) {
accept_event(); accept_event();
} }
if (!selected_item || select_mode == SELECT_ROW || selected_col < 0) { if (!selected_item || selected_col < 0) {
return; return;
} }
if (k.is_valid() && k->is_shift_pressed()) { if (k.is_valid() && k->is_shift_pressed()) {
selected_item->set_collapsed_recursive(true); selected_item->set_collapsed_recursive(true);
} else { } else if (select_mode != SELECT_ROW) {
_go_left(); _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) { } else if (p_event->is_action("ui_up") && p_event->is_pressed() && !is_command) {
if (!cursor_can_exit_tree) { if (!cursor_can_exit_tree) {
accept_event(); accept_event();