Skip to content

Commit

Permalink
Merge pull request #30865 from godotengine/revert-28952-update-margins
Browse files Browse the repository at this point in the history
Revert "Update Control margins when size is overridden by change to minsize"
  • Loading branch information
akien-mga authored Jul 27, 2019
2 parents 1107799 + f494d5f commit 94aabf5
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion scene/gui/control.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 94aabf5

Please sign in to comment.