From 448d2812226093b93001c3c2473d861ae56490f8 Mon Sep 17 00:00:00 2001
From: Gilles Roudiere <gilles.roudiere@gmail.com>
Date: Sun, 18 Mar 2018 22:33:17 +0100
Subject: [PATCH] Fixes wrong calculation of gridcontainer's children size

(cherry picked from commit 896e5a64d39e4dd477d961c5c78b480910fb6b09)
---
 scene/gui/grid_container.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scene/gui/grid_container.cpp b/scene/gui/grid_container.cpp
index 99486720978..b401abd436d 100644
--- a/scene/gui/grid_container.cpp
+++ b/scene/gui/grid_container.cpp
@@ -84,8 +84,8 @@ void GridContainer::_notification(int p_what) {
 				if (!row_expanded.has(E->key()))
 					remaining_space.height -= E->get();
 			}
-			remaining_space.height -= vsep * (max_row - 1);
-			remaining_space.width -= hsep * (max_col - 1);
+			remaining_space.height -= vsep * MAX(max_row - 1, 0);
+			remaining_space.width -= hsep * MAX(max_col - 1, 0);
 
 			bool can_fit = false;
 			while (!can_fit && col_expanded.size() > 0) {