1 files changed, 15 insertions, 12 deletions

diff --git a/scene/gui/grid_container.cpp b/scene/gui/grid_container.cpp
index 3c1f4bb93b..b2cf2f66a9 100644
--- a/scene/gui/grid_container.cpp
+++ b/scene/gui/grid_container.cpp
@@ -33,13 +33,13 @@
 void GridContainer::_notification(int p_what) {
 	switch (p_what) {
 		case NOTIFICATION_SORT_CHILDREN: {
-			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.
-			Set<int> row_expanded; // Rows which have the SIZE_EXPAND flag set.
+			HashMap<int, int> col_minw; // Max of min_width of all controls in each col (indexed by col).
+			HashMap<int, int> row_minh; // Max of min_height of all controls in each row (indexed by row).
+			RBSet<int> col_expanded; // Columns which have the SIZE_EXPAND flag set.
+			RBSet<int> row_expanded; // Rows which have the SIZE_EXPAND flag set.
 
-			int hsep = get_theme_constant(SNAME("hseparation"));
-			int vsep = get_theme_constant(SNAME("vseparation"));
+			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);
 
@@ -50,6 +50,9 @@ void GridContainer::_notification(int p_what) {
 				if (!c || !c->is_visible_in_tree()) {
 					continue;
 				}
+				if (c->is_set_as_top_level()) {
+					continue;
+				}
 
 				int row = valid_controls_index / columns;
 				int col = valid_controls_index % columns;
@@ -101,7 +104,7 @@ void GridContainer::_notification(int p_what) {
 				// Check if all minwidth constraints are OK if we use the remaining space.
 				can_fit = true;
 				int max_index = col_expanded.front()->get();
-				for (Set<int>::Element *E = col_expanded.front(); E; E = E->next()) {
+				for (RBSet<int>::Element *E = col_expanded.front(); E; E = E->next()) {
 					if (col_minw[E->get()] > col_minw[max_index]) {
 						max_index = E->get();
 					}
@@ -122,7 +125,7 @@ void GridContainer::_notification(int p_what) {
 				// Check if all minheight constraints are OK if we use the remaining space.
 				can_fit = true;
 				int max_index = row_expanded.front()->get();
-				for (Set<int>::Element *E = row_expanded.front(); E; E = E->next()) {
+				for (RBSet<int>::Element *E = row_expanded.front(); E; E = E->next()) {
 					if (row_minh[E->get()] > row_minh[max_index]) {
 						max_index = E->get();
 					}
@@ -211,11 +214,11 @@ void GridContainer::_bind_methods() {
 }
 
 Size2 GridContainer::get_minimum_size() const {
-	Map<int, int> col_minw;
-	Map<int, int> row_minh;
+	HashMap<int, int> col_minw;
+	HashMap<int, int> row_minh;
 
-	int hsep = get_theme_constant(SNAME("hseparation"));
-	int vsep = get_theme_constant(SNAME("vseparation"));
+	int hsep = get_theme_constant(SNAME("h_separation"));
+	int vsep = get_theme_constant(SNAME("v_separation"));
 
 	int max_row = 0;
 	int max_col = 0;