瀏覽代碼

Fix placement of ColorPicker in the editor

Yuri Rubinsky 1 年之前
父節點
當前提交
1fd1adc285
共有 2 個文件被更改,包括 4 次插入4 次删除
  1. 2 2
      scene/gui/box_container.cpp
  2. 2 2
      scene/gui/margin_container.cpp

+ 2 - 2
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;
 		}
 

+ 2 - 2
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;
 		}