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

Merge pull request #76833 from kleonc/gridcontainer-max-row-column-calculations-fix 

[3.x] Fix `GridContainer` max row/column calculations not skipping hidden children
This commit is contained in:
Rémi Verschelde 2023-05-08 15:06:28 +02:00 committed by GitHub
parent e250950760 0ce6ef7215
commit 627a2909c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scene/gui/grid_container.cpp
View File

@ -40,8 +40,6 @@ void GridContainer::_notification(int p_what) {
int hsep = get_constant("hseparation");
int vsep = get_constant("vseparation");
int max_col = MIN(get_child_count(), columns);
int max_row = ceil((float)get_child_count() / (float)columns);
// Compute the per-column/per-row data.
int valid_controls_index = 0;
@ -78,6 +76,9 @@ void GridContainer::_notification(int p_what) {
}
}
int max_col = MIN(valid_controls_index, columns);
int max_row = ceil((float)valid_controls_index / (float)columns);
// Consider all empty columns expanded.
for (int i = valid_controls_index; i < columns; i++) {
col_expanded.insert(i);