asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Fix children visibility check

Browse source 
(cherry picked from commit 280956ddc3)
This commit is contained in:
taigi100 2022-03-15 11:56:12 +02:00 • committed by Rémi Verschelde
parent b8178a7f0a
commit b33eed23ae
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
scene/gui/flow_container.cpp
View file

@ -41,6 +41,11 @@ struct _LineData {
}; };
void FlowContainer::_resort() { void FlowContainer::_resort() {
// Avoid resorting if invisible.
if (!is_visible_in_tree()) {
return;
}
int separation_horizontal = get_constant("hseparation"); int separation_horizontal = get_constant("hseparation");
int separation_vertical = get_constant("vseparation"); int separation_vertical = get_constant("vseparation");
@ -58,7 +63,7 @@ void FlowContainer::_resort() {
// First pass for line wrapping and minimum size calculation. // First pass for line wrapping and minimum size calculation.
for (int i = 0; i < get_child_count(); i++) { for (int i = 0; i < get_child_count(); i++) {
Control *child = Object::cast_to<Control>(get_child(i)); Control *child = Object::cast_to<Control>(get_child(i));
if (!child || !child->is_visible_in_tree()) { if (!child || !child->is_visible()) {
continue; continue;
} }
if (child->is_set_as_toplevel()) { if (child->is_set_as_toplevel()) {
@ -128,7 +133,7 @@ void FlowContainer::_resort() {
for (int i = 0; i < get_child_count(); i++) { for (int i = 0; i < get_child_count(); i++) {
Control *child = Object::cast_to<Control>(get_child(i)); Control *child = Object::cast_to<Control>(get_child(i));
if (!child || !child->is_visible_in_tree()) { if (!child || !child->is_visible()) {
continue; continue;
} }
if (child->is_set_as_toplevel()) { if (child->is_set_as_toplevel()) {