Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2025-04-10 13:52:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Backported: - Fix children visibility check (cherry picked from commit 280956d) - taigi100 - b33eed23ae

Browse Source
This commit is contained in:
Relintai 2022-03-20 19:12:43 +01:00
parent d7f455f36f
commit a89fa56bea
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()) {