1 files changed, 49 insertions, 22 deletions

diff --git a/scene/gui/box_container.cpp b/scene/gui/box_container.cpp
index cf2df4e1a2..df695feba8 100644
--- a/scene/gui/box_container.cpp
+++ b/scene/gui/box_container.cpp
@@ -5,8 +5,8 @@
 /*                           GODOT ENGINE                                */
 /*                      https://godotengine.org                          */
 /*************************************************************************/
-/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md).   */
+/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md).   */
 /*                                                                       */
 /* Permission is hereby granted, free of charge, to any person obtaining */
 /* a copy of this software and associated documentation files (the       */
@@ -29,6 +29,7 @@
 /*************************************************************************/
 
 #include "box_container.h"
+
 #include "label.h"
 #include "margin_container.h"
 
@@ -51,7 +52,7 @@ void BoxContainer::_resort() {
 	int stretch_min = 0;
 	int stretch_avail = 0;
 	float stretch_ratio_total = 0.0;
-	Map<Control *, _MinSizeCache> min_size_cache;
+	HashMap<Control *, _MinSizeCache> min_size_cache;
 
 	for (int i = 0; i < get_child_count(); i++) {
 		Control *c = Object::cast_to<Control>(get_child(i));
@@ -154,29 +155,29 @@ void BoxContainer::_resort() {
 	int ofs = 0;
 	if (!has_stretched) {
 		if (!vertical) {
-			switch (align) {
-				case ALIGN_BEGIN:
+			switch (alignment) {
+				case ALIGNMENT_BEGIN:
 					if (rtl) {
 						ofs = stretch_diff;
 					}
 					break;
-				case ALIGN_CENTER:
+				case ALIGNMENT_CENTER:
 					ofs = stretch_diff / 2;
 					break;
-				case ALIGN_END:
+				case ALIGNMENT_END:
 					if (!rtl) {
 						ofs = stretch_diff;
 					}
 					break;
 			}
 		} else {
-			switch (align) {
-				case ALIGN_BEGIN:
+			switch (alignment) {
+				case ALIGNMENT_BEGIN:
 					break;
-				case ALIGN_CENTER:
+				case ALIGNMENT_CENTER:
 					ofs = stretch_diff / 2;
 					break;
-				case ALIGN_END:
+				case ALIGNMENT_END:
 					ofs = stretch_diff;
 					break;
 			}
@@ -294,9 +295,11 @@ void BoxContainer::_notification(int p_what) {
 		case NOTIFICATION_SORT_CHILDREN: {
 			_resort();
 		} break;
+
 		case NOTIFICATION_THEME_CHANGED: {
-			minimum_size_changed();
+			update_minimum_size();
 		} break;
+
 		case NOTIFICATION_TRANSLATION_CHANGED:
 		case NOTIFICATION_LAYOUT_DIRECTION_CHANGED: {
 			queue_sort();
@@ -304,13 +307,13 @@ void BoxContainer::_notification(int p_what) {
 	}
 }
 
-void BoxContainer::set_alignment(AlignMode p_align) {
-	align = p_align;
+void BoxContainer::set_alignment(AlignmentMode p_alignment) {
+	alignment = p_alignment;
 	_resort();
 }
 
-BoxContainer::AlignMode BoxContainer::get_alignment() const {
-	return align;
+BoxContainer::AlignmentMode BoxContainer::get_alignment() const {
+	return alignment;
 }
 
 Control *BoxContainer::add_spacer(bool p_begin) {
@@ -331,6 +334,30 @@ Control *BoxContainer::add_spacer(bool p_begin) {
 	return c;
 }
 
+Vector<int> BoxContainer::get_allowed_size_flags_horizontal() const {
+	Vector<int> flags;
+	flags.append(SIZE_FILL);
+	if (!vertical) {
+		flags.append(SIZE_EXPAND);
+	}
+	flags.append(SIZE_SHRINK_BEGIN);
+	flags.append(SIZE_SHRINK_CENTER);
+	flags.append(SIZE_SHRINK_END);
+	return flags;
+}
+
+Vector<int> BoxContainer::get_allowed_size_flags_vertical() const {
+	Vector<int> flags;
+	flags.append(SIZE_FILL);
+	if (vertical) {
+		flags.append(SIZE_EXPAND);
+	}
+	flags.append(SIZE_SHRINK_BEGIN);
+	flags.append(SIZE_SHRINK_CENTER);
+	flags.append(SIZE_SHRINK_END);
+	return flags;
+}
+
 BoxContainer::BoxContainer(bool p_vertical) {
 	vertical = p_vertical;
 }
@@ -340,9 +367,9 @@ void BoxContainer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_alignment"), &BoxContainer::get_alignment);
 	ClassDB::bind_method(D_METHOD("set_alignment", "alignment"), &BoxContainer::set_alignment);
 
-	BIND_ENUM_CONSTANT(ALIGN_BEGIN);
-	BIND_ENUM_CONSTANT(ALIGN_CENTER);
-	BIND_ENUM_CONSTANT(ALIGN_END);
+	BIND_ENUM_CONSTANT(ALIGNMENT_BEGIN);
+	BIND_ENUM_CONSTANT(ALIGNMENT_CENTER);
+	BIND_ENUM_CONSTANT(ALIGNMENT_END);
 
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "alignment", PROPERTY_HINT_ENUM, "Begin,Center,End"), "set_alignment", "get_alignment");
 }
@@ -351,11 +378,11 @@ MarginContainer *VBoxContainer::add_margin_child(const String &p_label, Control
 	Label *l = memnew(Label);
 	l->set_theme_type_variation("HeaderSmall");
 	l->set_text(p_label);
-	add_child(l, false, INTERNAL_MODE_FRONT);
+	add_child(l);
 	MarginContainer *mc = memnew(MarginContainer);
 	mc->add_theme_constant_override("margin_left", 0);
-	mc->add_child(p_control);
-	add_child(mc, false, INTERNAL_MODE_FRONT);
+	mc->add_child(p_control, true);
+	add_child(mc);
 	if (p_expand) {
 		mc->set_v_size_flags(SIZE_EXPAND_FILL);
 	}