From 280956ddc325568af94b354630cfa28058b07e63 Mon Sep 17 00:00:00 2001 From: taigi100 Date: Tue, 15 Mar 2022 11:56:12 +0200 Subject: [PATCH] Fix children visibility check --- scene/gui/flow_container.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/scene/gui/flow_container.cpp b/scene/gui/flow_container.cpp index 3bd21f96b2a..40aca555db2 100644 --- a/scene/gui/flow_container.cpp +++ b/scene/gui/flow_container.cpp @@ -39,6 +39,11 @@ struct _LineData { }; void FlowContainer::_resort() { + // Avoid resorting if invisible. + if (!is_visible_in_tree()) { + return; + } + int separation_horizontal = get_theme_constant(SNAME("hseparation")); int separation_vertical = get_theme_constant(SNAME("vseparation")); @@ -58,7 +63,7 @@ void FlowContainer::_resort() { // First pass for line wrapping and minimum size calculation. for (int i = 0; i < get_child_count(); i++) { Control *child = Object::cast_to(get_child(i)); - if (!child || !child->is_visible_in_tree()) { + if (!child || !child->is_visible()) { continue; } if (child->is_set_as_top_level()) { @@ -128,7 +133,7 @@ void FlowContainer::_resort() { for (int i = 0; i < get_child_count(); i++) { Control *child = Object::cast_to(get_child(i)); - if (!child || !child->is_visible_in_tree()) { + if (!child || !child->is_visible()) { continue; } if (child->is_set_as_top_level()) {