diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-07-14 17:45:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-14 17:45:18 +0200 |
| commit | 74ab3dce4f8666a92bc986bfa0fa509458c8b773 (patch) | |
| tree | 0fea2cbd31e05700b493c818c57b468815d84eef | |
| parent | 8bfb634eac8d04ac5f37554d8e062c939920a775 (diff) | |
| parent | 153086152eb3e43ff6965c5df064d4a58f77a8a2 (diff) | |
Merge pull request #62835 from besh81/master
| -rw-r--r-- | scene/gui/grid_container.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scene/gui/grid_container.cpp b/scene/gui/grid_container.cpp index 6f8518a7b0..eaa6943ad2 100644 --- a/scene/gui/grid_container.cpp +++ b/scene/gui/grid_container.cpp @@ -41,8 +41,6 @@ void GridContainer::_notification(int p_what) { int hsep = get_theme_constant(SNAME("h_separation")); int vsep = get_theme_constant(SNAME("v_separation")); - 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; @@ -79,6 +77,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); |