Merge pull request #102738 from Giganzo/tree-filter-select

akien-mga · akien-mga · commit 800b63a99b4c · 2025-02-12T11:21:08.000+01:00
Fix tree selecting hidden items
diff --git a/scene/gui/tree.cpp b/scene/gui/tree.cpp
@@ -2841,7 +2841,9 @@ void Tree::select_single_item(TreeItem *p_selected, TreeItem *p_current, int p_c
 	TreeItem *c = p_current->first_child;
 
 	while (c) {
-		select_single_item(p_selected, c, p_col, p_prev, r_in_range, p_current->is_collapsed() || p_force_deselect);
+		if (c->is_visible()) {
+			select_single_item(p_selected, c, p_col, p_prev, r_in_range, p_current->is_collapsed() || p_force_deselect);
+		}
 		c = c->next;
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -2841,7 +2841,9 @@ void Tree::select_single_item(TreeItem p_selected, TreeItem p_current, int p_c`
`2841`	`2841`	`TreeItem *c = p_current->first_child;`
`2842`	`2842`
`2843`	`2843`	`while (c) {`
`2844`		`- select_single_item(p_selected, c, p_col, p_prev, r_in_range, p_current->is_collapsed() \|\| p_force_deselect);`
	`2844`	`+ if (c->is_visible()) {`
	`2845`	`+ select_single_item(p_selected, c, p_col, p_prev, r_in_range, p_current->is_collapsed() \|\| p_force_deselect);`
	`2846`	`+ }`
`2845`	`2847`	`c = c->next;`
`2846`	`2848`	`}`
`2847`	`2849`	`}`