summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2019-10-01 15:04:11 +0200
committerGitHub <noreply@github.com>2019-10-01 15:04:11 +0200
commit871a9d5d56ead0b640618762cd945be0fb2cff97 (patch)
treedcf0f0d81e10412fa93ee6401bade5b4a57214db
parentb60fdb21e9be16d96ae6b419db751140738d80ce (diff)
parent848eeafe294cdb6bdf82af829e36add97e551016 (diff)
Merge pull request #32467 from Ternvein/grid-container-min-size-fix
Fix GridContainer children visibility check for min size evaluation
-rw-r--r--scene/gui/grid_container.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/gui/grid_container.cpp b/scene/gui/grid_container.cpp
index a6842603fd..d304a37f82 100644
--- a/scene/gui/grid_container.cpp
+++ b/scene/gui/grid_container.cpp
@@ -210,7 +210,7 @@ Size2 GridContainer::get_minimum_size() const {
for (int i = 0; i < get_child_count(); i++) {
Control *c = Object::cast_to<Control>(get_child(i));
- if (!c || !c->is_visible_in_tree())
+ if (!c || !c->is_visible())
continue;
int row = valid_controls_index / columns;
int col = valid_controls_index % columns;