diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-07-13 18:04:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-13 18:04:33 +0200 |
| commit | 79137a02608d65fd5f664a5210919c2e71ea6c5f (patch) | |
| tree | 42b2682eb5749c32474bab971e69af30aab852db | |
| parent | b61b30e6ff2f52115b9e3d50234c9a30d5fc5055 (diff) | |
| parent | fe5605334a3d8ce15ae312e4c5b9607c241ca537 (diff) | |
Merge pull request #50299 from YeldhamDev/window_wrap_controls_fix
Fix `Window`'s `wrap_controls` not actually doing anything
| -rw-r--r-- | scene/main/window.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scene/main/window.cpp b/scene/main/window.cpp index 31d2482e53..c557fd0101 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(); @@ -542,6 +542,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 |