1 files changed, 66 insertions, 36 deletions

diff --git a/scene/gui/subviewport_container.cpp b/scene/gui/subviewport_container.cpp
index 6cc64e7ada..c66e145bc4 100644
--- a/scene/gui/subviewport_container.cpp
+++ b/scene/gui/subviewport_container.cpp
@@ -54,6 +54,7 @@ Size2 SubViewportContainer::get_minimum_size() const {
 
 void SubViewportContainer::set_stretch(bool p_enable) {
 	stretch = p_enable;
+	update_minimum_size();
 	queue_sort();
 	update();
 }
@@ -90,52 +91,81 @@ int SubViewportContainer::get_stretch_shrink() const {
 	return shrink;
 }
 
-void SubViewportContainer::_notification(int p_what) {
-	if (p_what == NOTIFICATION_RESIZED) {
-		if (!stretch) {
-			return;
-		}
+Vector<int> SubViewportContainer::get_allowed_size_flags_horizontal() const {
+	return Vector<int>();
+}
+
+Vector<int> SubViewportContainer::get_allowed_size_flags_vertical() const {
+	return Vector<int>();
+}
 
-		for (int i = 0; i < get_child_count(); i++) {
-			SubViewport *c = Object::cast_to<SubViewport>(get_child(i));
-			if (!c) {
-				continue;
+void SubViewportContainer::_notification(int p_what) {
+	switch (p_what) {
+		case NOTIFICATION_RESIZED: {
+			if (!stretch) {
+				return;
 			}
 
-			c->set_size(get_size() / shrink);
-		}
-	}
+			for (int i = 0; i < get_child_count(); i++) {
+				SubViewport *c = Object::cast_to<SubViewport>(get_child(i));
+				if (!c) {
+					continue;
+				}
 
-	if (p_what == NOTIFICATION_ENTER_TREE || p_what == NOTIFICATION_VISIBILITY_CHANGED) {
-		for (int i = 0; i < get_child_count(); i++) {
-			SubViewport *c = Object::cast_to<SubViewport>(get_child(i));
-			if (!c) {
-				continue;
+				c->set_size(get_size() / shrink);
 			}
-
-			if (is_visible_in_tree()) {
-				c->set_update_mode(SubViewport::UPDATE_ALWAYS);
-			} else {
-				c->set_update_mode(SubViewport::UPDATE_DISABLED);
+		} break;
+
+		case NOTIFICATION_ENTER_TREE:
+		case NOTIFICATION_VISIBILITY_CHANGED: {
+			for (int i = 0; i < get_child_count(); i++) {
+				SubViewport *c = Object::cast_to<SubViewport>(get_child(i));
+				if (!c) {
+					continue;
+				}
+
+				if (is_visible_in_tree()) {
+					c->set_update_mode(SubViewport::UPDATE_ALWAYS);
+				} else {
+					c->set_update_mode(SubViewport::UPDATE_DISABLED);
+				}
+
+				c->set_handle_input_locally(false); //do not handle input locally here
+			}
+		} break;
+
+		case NOTIFICATION_DRAW: {
+			for (int i = 0; i < get_child_count(); i++) {
+				SubViewport *c = Object::cast_to<SubViewport>(get_child(i));
+				if (!c) {
+					continue;
+				}
+
+				if (stretch) {
+					draw_texture_rect(c->get_texture(), Rect2(Vector2(), get_size()));
+				} else {
+					draw_texture_rect(c->get_texture(), Rect2(Vector2(), c->get_size()));
+				}
 			}
+		} break;
 
-			c->set_handle_input_locally(false); //do not handle input locally here
-		}
-	}
+		case NOTIFICATION_MOUSE_ENTER: {
+			_notify_viewports(NOTIFICATION_VP_MOUSE_ENTER);
+		} break;
 
-	if (p_what == NOTIFICATION_DRAW) {
-		for (int i = 0; i < get_child_count(); i++) {
-			SubViewport *c = Object::cast_to<SubViewport>(get_child(i));
-			if (!c) {
-				continue;
-			}
+		case NOTIFICATION_MOUSE_EXIT: {
+			_notify_viewports(NOTIFICATION_VP_MOUSE_EXIT);
+		} break;
+	}
+}
 
-			if (stretch) {
-				draw_texture_rect(c->get_texture(), Rect2(Vector2(), get_size()));
-			} else {
-				draw_texture_rect(c->get_texture(), Rect2(Vector2(), c->get_size()));
-			}
+void SubViewportContainer::_notify_viewports(int p_notification) {
+	for (int i = 0; i < get_child_count(); i++) {
+		SubViewport *c = Object::cast_to<SubViewport>(get_child(i));
+		if (!c) {
+			continue;
 		}
+		c->notification(p_notification);
 	}
 }