summaryrefslogtreecommitdiff
path: root/scene/gui
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2016-06-17 16:40:40 -0300
committerJuan Linietsky <reduzio@gmail.com>2016-06-17 16:40:40 -0300
commit6a68ce9c93fb47d69718cf41c97074138b81c620 (patch)
tree08fb5bba130d2d5c3840b384ca97ea026a8a7fe6 /scene/gui
parent55b83157e70a34a933a2a73f14a0052a832d0287 (diff)
Fix bug in GridContainer not updating minimumsize when columns changes, fixes #4677
Diffstat (limited to 'scene/gui')
-rw-r--r--scene/gui/control.cpp2
-rw-r--r--scene/gui/grid_container.cpp1
2 files changed, 2 insertions, 1 deletions
diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp
index 7e4db82193..edc8a8bcb8 100644
--- a/scene/gui/control.cpp
+++ b/scene/gui/control.cpp
@@ -2266,7 +2266,7 @@ void Control::_ref_font( Ref<Font> p_sc) {
}
}
-void Control::_unref_font(Ref<Font> p_sc) {
+void Control::_unref_font(Ref<Font> p_sc) {
ERR_FAIL_COND(!data.font_refcount.has(p_sc));
data.font_refcount[p_sc]--;
diff --git a/scene/gui/grid_container.cpp b/scene/gui/grid_container.cpp
index a514f1b3d7..dde9768a6d 100644
--- a/scene/gui/grid_container.cpp
+++ b/scene/gui/grid_container.cpp
@@ -158,6 +158,7 @@ void GridContainer::set_columns(int p_columns) {
columns=p_columns;
queue_sort();
+ minimum_size_changed();
}