1 files changed, 10 insertions, 6 deletions

diff --git a/scene/gui/box_container.cpp b/scene/gui/box_container.cpp
index a56a51a547..22c8f2cd4e 100644
--- a/scene/gui/box_container.cpp
+++ b/scene/gui/box_container.cpp
@@ -44,7 +44,6 @@ void BoxContainer::_resort() {
 
 	Size2i new_size = get_size();
 
-	int sep = get_theme_constant(SNAME("separation")); //,vertical?"VBoxContainer":"HBoxContainer");
 	bool rtl = is_layout_rtl();
 
 	bool first = true;
@@ -90,7 +89,7 @@ void BoxContainer::_resort() {
 		return;
 	}
 
-	int stretch_max = (vertical ? new_size.height : new_size.width) - (children_count - 1) * sep;
+	int stretch_max = (vertical ? new_size.height : new_size.width) - (children_count - 1) * theme_cache.separation;
 	int stretch_diff = stretch_max - stretch_min;
 	if (stretch_diff < 0) {
 		//avoid negative stretch space
@@ -214,7 +213,7 @@ void BoxContainer::_resort() {
 		if (first) {
 			first = false;
 		} else {
-			ofs += sep;
+			ofs += theme_cache.separation;
 		}
 
 		int from = ofs;
@@ -248,7 +247,6 @@ Size2 BoxContainer::get_minimum_size() const {
 	/* Calculate MINIMUM SIZE */
 
 	Size2i minimum;
-	int sep = get_theme_constant(SNAME("separation")); //,vertical?"VBoxContainer":"HBoxContainer");
 
 	bool first = true;
 
@@ -273,7 +271,7 @@ Size2 BoxContainer::get_minimum_size() const {
 				minimum.width = size.width;
 			}
 
-			minimum.height += size.height + (first ? 0 : sep);
+			minimum.height += size.height + (first ? 0 : theme_cache.separation);
 
 		} else { /* HORIZONTAL */
 
@@ -281,7 +279,7 @@ Size2 BoxContainer::get_minimum_size() const {
 				minimum.height = size.height;
 			}
 
-			minimum.width += size.width + (first ? 0 : sep);
+			minimum.width += size.width + (first ? 0 : theme_cache.separation);
 		}
 
 		first = false;
@@ -290,6 +288,12 @@ Size2 BoxContainer::get_minimum_size() const {
 	return minimum;
 }
 
+void BoxContainer::_update_theme_item_cache() {
+	Container::_update_theme_item_cache();
+
+	theme_cache.separation = get_theme_constant(SNAME("separation")); //,vertical?"VBoxContainer":"HBoxContainer");
+}
+
 void BoxContainer::_notification(int p_what) {
 	switch (p_what) {
 		case NOTIFICATION_SORT_CHILDREN: {