From 153086152eb3e43ff6965c5df064d4a58f77a8a2 Mon Sep 17 00:00:00 2001 From: besh81 Date: Fri, 8 Jul 2022 13:07:15 +0200 Subject: [PATCH] Fixed bug in grid_container with hidden children Fix a bug that occour when there are hidden children in grid_container. The visualization isn't correct due to a wrong calculation of max_col and max_row that mistakenly includes hidden children. --- scene/gui/grid_container.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scene/gui/grid_container.cpp b/scene/gui/grid_container.cpp index 6f8518a7b01..eaa6943ad2c 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);