summaryrefslogtreecommitdiff
path: root/scene
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2019-07-27 12:57:35 +0200
committerGitHub <noreply@github.com>2019-07-27 12:57:35 +0200
commit94aabf56a0a22df689bc57c71981c0008eb40464 (patch)
treead6e4b072deca0618683423a57f9122ab8e2c99b /scene
parent1107799de5d487f285d8a743357fd6928351a06d (diff)
parentf494d5f10b2b81b6f2c6ea18f491027d9d6276d9 (diff)
Merge pull request #30865 from godotengine/revert-28952-update-margins
Revert "Update Control margins when size is overridden by change to minsize"
Diffstat (limited to 'scene')
-rw-r--r--scene/gui/control.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp
index 1d6f3dc782..5ec6c68163 100644
--- a/scene/gui/control.cpp
+++ b/scene/gui/control.cpp
@@ -289,7 +289,7 @@ void Control::_update_minimum_size() {
Size2 minsize = get_combined_minimum_size();
if (minsize.x > data.size_cache.x ||
minsize.y > data.size_cache.y) {
- set_size(data.size_cache);
+ _size_changed();
}
data.updating_last_minimum_size = false;