summaryrefslogtreecommitdiff
path: root/scene/main
diff options
context:
space:
mode:
authorMichael Alexsander <michaelalexsander@protonmail.com>2021-07-08 20:06:16 -0300
committerMichael Alexsander <michaelalexsander@protonmail.com>2021-07-08 20:06:16 -0300
commitfe5605334a3d8ce15ae312e4c5b9607c241ca537 (patch)
treee7fc1187fa02f8dcdf4429c47583625dc7fc582a /scene/main
parentd4e5fe6c44cecccd4f925707ccd5bbe1511184e5 (diff)
Fix `Window`'s `wrap_controls` not actually doing anything
Diffstat (limited to 'scene/main')
-rw-r--r--scene/main/window.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/scene/main/window.cpp b/scene/main/window.cpp
index cf2a6b2adf..237dc24aad 100644
--- a/scene/main/window.cpp
+++ b/scene/main/window.cpp
@@ -115,7 +115,7 @@ Size2i Window::get_max_size() const {
void Window::set_min_size(const Size2i &p_min_size) {
min_size = p_min_size;
- if (window_id != DisplayServer::INVALID_WINDOW_ID) {
+ if (!wrap_controls && window_id != DisplayServer::INVALID_WINDOW_ID) {
DisplayServer::get_singleton()->window_set_min_size(min_size, window_id);
}
_update_window_size();
@@ -541,6 +541,7 @@ void Window::_update_window_size() {
embedder->_sub_window_update(this);
} else if (window_id != DisplayServer::INVALID_WINDOW_ID) {
DisplayServer::get_singleton()->window_set_size(size, window_id);
+ DisplayServer::get_singleton()->window_set_min_size(size_limit, window_id);
}
//update the viewport