Merge pull request #107834 from BrotherShort/fix-rename-autoloads

akien-mga · akien-mga · commit d7bdc0be160c · 2025-06-22T11:59:36.000+02:00
Tree: Fix handling of `__focus_rect` with various Select Modes
diff --git a/scene/gui/tree.cpp b/scene/gui/tree.cpp
@@ -2370,7 +2370,7 @@ int Tree::draw_item(const Point2i &p_pos, const Point2 &p_draw_ofs, const Size2
 				}
 			}
 
-			if ((select_mode != SELECT_SINGLE && selected_item == p_item) || p_item->cells[i].selected || !p_item->has_meta("__focus_rect")) {
+			if ((select_mode == SELECT_ROW && selected_item == p_item) || (select_mode == SELECT_MULTI && selected_item == p_item && selected_col == i) || p_item->cells[i].selected || !p_item->has_meta("__focus_rect")) {
 				Rect2i r = cell_rect;
 
 				if (select_mode != SELECT_ROW) {

Original file line number	Diff line number	Diff line change
`@@ -2370,7 +2370,7 @@ int Tree::draw_item(const Point2i &p_pos, const Point2 &p_draw_ofs, const Size2`
`2370`	`2370`	`}`
`2371`	`2371`	`}`
`2372`	`2372`
`2373`		`- if ((select_mode != SELECT_SINGLE && selected_item == p_item) \|\| p_item->cells[i].selected \|\| !p_item->has_meta("__focus_rect")) {`
	`2373`	`+ if ((select_mode == SELECT_ROW && selected_item == p_item) \|\| (select_mode == SELECT_MULTI && selected_item == p_item && selected_col == i) \|\| p_item->cells[i].selected \|\| !p_item->has_meta("__focus_rect")) {`
`2374`	`2374`	`Rect2i r = cell_rect;`
`2375`	`2375`
`2376`	`2376`	`if (select_mode != SELECT_ROW) {`