Merge pull request #93386 from anniryynanen/grid-min-size

akien-mga · akien-mga · commit 9de785639db4 · 2024-06-20T16:19:02.000+02:00
Fix GridContainer minimum size when there's a hidden parent
diff --git a/scene/gui/grid_container.cpp b/scene/gui/grid_container.cpp
@@ -279,7 +279,7 @@ Size2 GridContainer::get_minimum_size() const {
 
 	int valid_controls_index = 0;
 	for (int i = 0; i < get_child_count(); i++) {
-		Control *c = as_sortable_control(get_child(i));
+		Control *c = as_sortable_control(get_child(i), SortableVisbilityMode::VISIBLE);
 		if (!c) {
 			continue;
 		}

Original file line number	Diff line number	Diff line change
`@@ -279,7 +279,7 @@ Size2 GridContainer::get_minimum_size() const {`
`279`	`279`
`280`	`280`	`int valid_controls_index = 0;`
`281`	`281`	`for (int i = 0; i < get_child_count(); i++) {`
`282`		`- Control *c = as_sortable_control(get_child(i));`
	`282`	`+ Control *c = as_sortable_control(get_child(i), SortableVisbilityMode::VISIBLE);`
`283`	`283`	`if (!c) {`
`284`	`284`	`continue;`
`285`	`285`	`}`