From c3f982156d9dec1fa737bb9b1a20acb2060daa6b Mon Sep 17 00:00:00 2001
From: groud <gilles.roudiere@gmail.com>
Date: Mon, 23 Apr 2018 20:00:06 +0200
Subject: [PATCH] Fix GridContainer's children visibility breaking the layout

---
 scene/gui/grid_container.cpp | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/scene/gui/grid_container.cpp b/scene/gui/grid_container.cpp
index b401abd436d..bb1d1d76956 100644
--- a/scene/gui/grid_container.cpp
+++ b/scene/gui/grid_container.cpp
@@ -36,6 +36,8 @@ void GridContainer::_notification(int p_what) {
 
 		case NOTIFICATION_SORT_CHILDREN: {
 
+			int valid_controls_index;
+
 			Map<int, int> col_minw; // max of min_width  of all controls in each col (indexed by col)
 			Map<int, int> row_minh; // max of min_height of all controls in each row (indexed by row)
 			Set<int> col_expanded; // columns which have the SIZE_EXPAND flag set
@@ -47,13 +49,15 @@ void GridContainer::_notification(int p_what) {
 			int max_row = get_child_count() / columns;
 
 			// Compute the per-column/per-row data
+			valid_controls_index = 0;
 			for (int i = 0; i < get_child_count(); i++) {
 				Control *c = Object::cast_to<Control>(get_child(i));
 				if (!c || !c->is_visible_in_tree())
 					continue;
 
-				int row = i / columns;
-				int col = i % columns;
+				int row = valid_controls_index / columns;
+				int col = valid_controls_index % columns;
+				valid_controls_index++;
 
 				Size2i ms = c->get_combined_minimum_size();
 				if (col_minw.has(col))
@@ -136,12 +140,14 @@ void GridContainer::_notification(int p_what) {
 			int col_ofs = 0;
 			int row_ofs = 0;
 
+			valid_controls_index = 0;
 			for (int i = 0; i < get_child_count(); i++) {
 				Control *c = Object::cast_to<Control>(get_child(i));
 				if (!c || !c->is_visible_in_tree())
 					continue;
-				int row = i / columns;
-				int col = i % columns;
+				int row = valid_controls_index / columns;
+				int col = valid_controls_index % columns;
+				valid_controls_index++;
 
 				if (col == 0) {
 					col_ofs = 0;
@@ -190,17 +196,19 @@ Size2 GridContainer::get_minimum_size() const {
 	int hsep = get_constant("hseparation");
 	int vsep = get_constant("vseparation");
 
-	int idx = 0;
 	int max_row = 0;
 	int max_col = 0;
 
+	int valid_controls_index = 0;
 	for (int i = 0; i < get_child_count(); i++) {
 
 		Control *c = Object::cast_to<Control>(get_child(i));
 		if (!c || !c->is_visible_in_tree())
 			continue;
-		int row = idx / columns;
-		int col = idx % columns;
+		int row = valid_controls_index / columns;
+		int col = valid_controls_index % columns;
+		valid_controls_index++;
+
 		Size2i ms = c->get_combined_minimum_size();
 		if (col_minw.has(col))
 			col_minw[col] = MAX(col_minw[col], ms.width);
@@ -213,7 +221,6 @@ Size2 GridContainer::get_minimum_size() const {
 			row_minh[row] = ms.height;
 		max_col = MAX(col, max_col);
 		max_row = MAX(row, max_row);
-		idx++;
 	}
 
 	Size2 ms;