Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #73396 from KoBeWi/sorry

Browse source 
Fix crash with AspectRatioContainer and TextureRect
This commit is contained in:
Rémi Verschelde 2023-02-16 18:34:41 +01:00
commit 25da47edd6
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
scene/gui/aspect_ratio_container.cpp
View file

@ -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;