Merge pull request #103168 from Giganzo/tree-edge-hover

akien-mga · akien-mga · commit c4731e1d5b8f · 2025-02-25T15:27:59.000+01:00
Fix Tree hover position with multiple columns
diff --git a/scene/gui/tree.cpp b/scene/gui/tree.cpp
@@ -5487,15 +5487,14 @@ Tree::FindColumnButtonResult Tree::_find_column_and_button_at_pos(int p_x, const
 			}
 		}
 
-		if (x > col_width) {
-			col_ofs += col_width;
-			x -= col_width;
-			limit_w -= col_width;
-			continue;
+		if (x < col_width) {
+			col = i;
+			break;
 		}
 
-		col = i;
-		break;
+		col_ofs += col_width;
+		x -= col_width;
+		limit_w -= col_width;
 	}
 
 	if (col >= 0) {

Original file line number	Diff line number	Diff line change
`@@ -5487,15 +5487,14 @@ Tree::FindColumnButtonResult Tree::_find_column_and_button_at_pos(int p_x, const`
`5487`	`5487`	`}`
`5488`	`5488`	`}`
`5489`	`5489`
`5490`		`- if (x > col_width) {`
`5491`		`- col_ofs += col_width;`
`5492`		`- x -= col_width;`
`5493`		`- limit_w -= col_width;`
`5494`		`- continue;`
	`5490`	`+ if (x < col_width) {`
	`5491`	`+ col = i;`
	`5492`	`+ break;`
`5495`	`5493`	`}`
`5496`	`5494`
`5497`		`- col = i;`
`5498`		`- break;`
	`5495`	`+ col_ofs += col_width;`
	`5496`	`+ x -= col_width;`
	`5497`	`+ limit_w -= col_width;`
`5499`	`5498`	`}`
`5500`	`5499`
`5501`	`5500`	`if (col >= 0) {`