godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #93179 from TheSofox/tree-nav-crash

Browse Source 
Fix engine crashing when using Down Arrow selection on Tree with no selection
This commit is contained in:
Rémi Verschelde 2024-06-24 11:14:06 +02:00
commit bf20231140
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
scene/gui/tree.cpp
View File

@ -3354,15 +3354,16 @@ void Tree::_go_up() {
prev = selected_item->get_prev_visible(); prev = selected_item->get_prev_visible();
} }
int col = MAX(selected_col, 0);
if (select_mode == SELECT_MULTI) { if (select_mode == SELECT_MULTI) {
if (!prev) { if (!prev) {
return; return;
} }
select_single_item(prev, get_root(), selected_col); select_single_item(prev, get_root(), col);
queue_redraw(); queue_redraw();
} else { } else {
int col = selected_col < 0 ? 0 : selected_col;
while (prev && !prev->cells[col].selectable) { while (prev && !prev->cells[col].selectable) {
prev = prev->get_prev_visible(); prev = prev->get_prev_visible();
} }
@ -3386,16 +3387,16 @@ void Tree::_go_down() {
next = selected_item->get_next_visible(); next = selected_item->get_next_visible();
} }
int col = MAX(selected_col, 0);
if (select_mode == SELECT_MULTI) { if (select_mode == SELECT_MULTI) {
if (!next) { if (!next) {
return; return;
} }
select_single_item(next, get_root(), selected_col); select_single_item(next, get_root(), col);
queue_redraw(); queue_redraw();
} else { } else {
int col = selected_col < 0 ? 0 : selected_col;
while (next && !next->cells[col].selectable) { while (next && !next->cells[col].selectable) {
next = next->get_next_visible(); next = next->get_next_visible();
} }
@ -4471,7 +4472,7 @@ TreeItem *Tree::get_last_item() const {
while (last) { while (last) {
if (last->next) { if (last->next) {
last = last->next; last = last->next;
} else if (last->first_child) { } else if (last->first_child && !last->collapsed) {
last = last->first_child; last = last->first_child;
} else { } else {
break; break;