More fill modes for containers, closes #9504

3 files changed, 22 insertions, 6 deletions

diff --git a/scene/gui/container.cpp b/scene/gui/container.cpp
index 92bb5d43a7..2a96f8260c 100644
--- a/scene/gui/container.cpp
+++ b/scene/gui/container.cpp
@@ -95,13 +95,25 @@ void Container::fit_child_in_rect(Control *p_child, const Rect2 &p_rect) {
 	Rect2 r = p_rect;
 
 	if (!(p_child->get_h_size_flags() & SIZE_FILL)) {
-		r.size.x = minsize.x;
-		r.position.x += Math::floor((p_rect.size.x - minsize.x) / 2);
+		r.size.x = minsize.width;
+		if (p_child->get_h_size_flags() & SIZE_SHRINK_END) {
+			r.position.x += p_rect.size.width - minsize.width;
+		} else if (p_child->get_h_size_flags() & SIZE_SHRINK_CENTER) {
+			r.position.x += Math::floor((p_rect.size.x - minsize.width) / 2);
+		} else {
+			r.position.x += 0;
+		}
 	}
 
 	if (!(p_child->get_v_size_flags() & SIZE_FILL)) {
 		r.size.y = minsize.y;
-		r.position.y += Math::floor((p_rect.size.y - minsize.y) / 2);
+		if (p_child->get_v_size_flags() & SIZE_SHRINK_END) {
+			r.position.y += p_rect.size.height - minsize.height;
+		} else if (p_child->get_v_size_flags() & SIZE_SHRINK_CENTER) {
+			r.position.y += Math::floor((p_rect.size.y - minsize.height) / 2);
+		} else {
+			r.position.y += 0;
+		}
 	}
 
 	for (int i = 0; i < 4; i++)
diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp
index 4cb779c21b..bf8d81d4a6 100644
--- a/scene/gui/control.cpp
+++ b/scene/gui/control.cpp
@@ -2534,8 +2534,8 @@ void Control::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "mouse_filter", PROPERTY_HINT_ENUM, "Stop,Pass,Ignore"), "set_mouse_filter", "get_mouse_filter");
 
 	ADD_GROUP("Size Flags", "size_flags_");
-	ADD_PROPERTYNO(PropertyInfo(Variant::INT, "size_flags_horizontal", PROPERTY_HINT_FLAGS, "Fill,Expand"), "set_h_size_flags", "get_h_size_flags");
-	ADD_PROPERTYNO(PropertyInfo(Variant::INT, "size_flags_vertical", PROPERTY_HINT_FLAGS, "Fill,Expand"), "set_v_size_flags", "get_v_size_flags");
+	ADD_PROPERTYNO(PropertyInfo(Variant::INT, "size_flags_horizontal", PROPERTY_HINT_FLAGS, "Fill,Expand,Shrink Center,Shrink End"), "set_h_size_flags", "get_h_size_flags");
+	ADD_PROPERTYNO(PropertyInfo(Variant::INT, "size_flags_vertical", PROPERTY_HINT_FLAGS, "Fill,Expand,Shrink Center,Shrink End"), "set_v_size_flags", "get_v_size_flags");
 	ADD_PROPERTYNO(PropertyInfo(Variant::INT, "size_flags_stretch_ratio", PROPERTY_HINT_RANGE, "1,128,0.01"), "set_stretch_ratio", "get_stretch_ratio");
 	ADD_GROUP("Theme", "");
 	ADD_PROPERTYNZ(PropertyInfo(Variant::OBJECT, "theme", PROPERTY_HINT_RESOURCE_TYPE, "Theme"), "set_theme", "get_theme");
@@ -2577,6 +2577,8 @@ void Control::_bind_methods() {
 	BIND_CONSTANT(SIZE_EXPAND);
 	BIND_CONSTANT(SIZE_FILL);
 	BIND_CONSTANT(SIZE_EXPAND_FILL);
+	BIND_CONSTANT(SIZE_SHRINK_CENTER);
+	BIND_CONSTANT(SIZE_SHRINK_END);
 
 	BIND_CONSTANT(MOUSE_FILTER_STOP);
 	BIND_CONSTANT(MOUSE_FILTER_PASS);
diff --git a/scene/gui/control.h b/scene/gui/control.h
index 92acedd89c..86cf8f6dbd 100644
--- a/scene/gui/control.h
+++ b/scene/gui/control.h
@@ -72,7 +72,9 @@ public:
 
 		SIZE_FILL = 1,
 		SIZE_EXPAND = 2,
-		SIZE_EXPAND_FILL = SIZE_EXPAND | SIZE_FILL
+		SIZE_EXPAND_FILL = SIZE_EXPAND | SIZE_FILL,
+		SIZE_SHRINK_CENTER = 4, //ignored by expand or fill
+		SIZE_SHRINK_END = 8, //ignored by expand or fil
 
 	};