Merge pull request #91757 from Chaosus/fix_color_picker_placement

Fix placement of ColorPicker in the editor
godotengine · May 10, 2024 · a294825 · a294825
2 parents 6766404 + 1fd1adc
commit a294825
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/scene/gui/box_container.cpp b/scene/gui/box_container.cpp
@@ -243,8 +243,8 @@ Size2 BoxContainer::get_minimum_size() const {
 	bool first = true;
 
 	for (int i = 0; i < get_child_count(); i++) {
-		Control *c = as_sortable_control(get_child(i));
-		if (!c) {
+		Control *c = Object::cast_to<Control>(get_child(i));
+		if (!c || !c->is_visible() || c->is_set_as_top_level()) {
 			continue;
 		}
 

diff --git a/scene/gui/margin_container.cpp b/scene/gui/margin_container.cpp
@@ -36,8 +36,8 @@ Size2 MarginContainer::get_minimum_size() const {
 	Size2 max;
 
 	for (int i = 0; i < get_child_count(); i++) {
-		Control *c = as_sortable_control(get_child(i));
-		if (!c) {
+		Control *c = Object::cast_to<Control>(get_child(i));
+		if (!c || !c->is_visible() || c->is_set_as_top_level()) {
 			continue;
 		}