Merge pull request #73396 from KoBeWi/sorry

Fix crash with AspectRatioContainer and TextureRect

1 files changed, 12 insertions, 0 deletions

diff --git a/scene/gui/aspect_ratio_container.cpp b/scene/gui/aspect_ratio_container.cpp
index 802189c374..94240ccead 100644
--- a/scene/gui/aspect_ratio_container.cpp
+++ b/scene/gui/aspect_ratio_container.cpp
@@ -30,6 +30,8 @@
 
 #include "aspect_ratio_container.h"
 
+#include "scene/gui/texture_rect.h"
+
 Size2 AspectRatioContainer::get_minimum_size() const {
 	Size2 ms;
 	for (int i = 0; i < get_child_count(); i++) {
@@ -113,6 +115,16 @@ void AspectRatioContainer::_notification(int p_what) {
 				if (c->is_set_as_top_level()) {
 					continue;
 				}
+
+				// Temporary fix for editor crash.
+				TextureRect *trect = Object::cast_to<TextureRect>(c);
+				if (trect) {
+					if (trect->get_expand_mode() == TextureRect::EXPAND_FIT_WIDTH_PROPORTIONAL || trect->get_expand_mode() == TextureRect::EXPAND_FIT_HEIGHT_PROPORTIONAL) {
+						WARN_PRINT_ONCE("Proportional TextureRect is currently not supported inside AspectRatioContainer");
+						continue;
+					}
+				}
+
 				Size2 child_minsize = c->get_combined_minimum_size();
 				Size2 child_size = Size2(ratio, 1.0);
 				float scale_factor = 1.0;