summaryrefslogtreecommitdiffstats
path: root/scene/gui/flow_container.cpp
diff options
context:
space:
mode:
authortaigi100 <taigi100@pm.me>2022-03-15 11:56:12 +0200
committertaigi100 <taigi100@pm.me>2022-03-16 15:51:27 +0200
commit280956ddc325568af94b354630cfa28058b07e63 (patch)
tree7fe71a3711006af19161ec56c8ea38af819787d9 /scene/gui/flow_container.cpp
parent9d732aa0cfcfd638c28ac8eb8149d912a5a3a642 (diff)
downloadredot-engine-280956ddc325568af94b354630cfa28058b07e63.tar.gz
Fix children visibility check
Diffstat (limited to 'scene/gui/flow_container.cpp')
-rw-r--r--scene/gui/flow_container.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/scene/gui/flow_container.cpp b/scene/gui/flow_container.cpp
index 3bd21f96b2..40aca555db 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<Control>(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<Control>(get_child(i));
- if (!child || !child->is_visible_in_tree()) {
+ if (!child || !child->is_visible()) {
continue;
}
if (child->is_set_as_top_level()) {