diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-06-17 12:23:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-17 12:23:22 +0200 |
| commit | 32dd5937b6dba4945acd234db7cf8362a60d2aa5 (patch) | |
| tree | ed38d1b1f7c5efd4c42efec67eda07bb170f0af8 | |
| parent | 362f53ff02c381ea94640baa16e84e6f6956efef (diff) | |
| parent | 53bd72fa705c79f568bd52d984f0a80eea7347a3 (diff) | |
Merge pull request #61982 from Rindbee/fix-dialogs-get-contents-minimum-size
| -rw-r--r-- | scene/main/window.cpp | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/scene/main/window.cpp b/scene/main/window.cpp index 1d697a2176..11c2a495ad 100644 --- a/scene/main/window.cpp +++ b/scene/main/window.cpp @@ -111,31 +111,19 @@ Size2i Window::get_real_size() const { void Window::set_max_size(const Size2i &p_max_size) { max_size = p_max_size; - if (window_id != DisplayServer::INVALID_WINDOW_ID) { - DisplayServer::get_singleton()->window_set_max_size(max_size, window_id); - } _update_window_size(); } Size2i Window::get_max_size() const { - if (window_id != DisplayServer::INVALID_WINDOW_ID) { - max_size = DisplayServer::get_singleton()->window_get_max_size(window_id); - } return max_size; } void Window::set_min_size(const Size2i &p_min_size) { min_size = p_min_size; - if (!wrap_controls && window_id != DisplayServer::INVALID_WINDOW_ID) { - DisplayServer::get_singleton()->window_set_min_size(min_size, window_id); - } _update_window_size(); } Size2i Window::get_min_size() const { - if (window_id != DisplayServer::INVALID_WINDOW_ID) { - min_size = DisplayServer::get_singleton()->window_get_min_size(window_id); - } return min_size; } @@ -621,6 +609,7 @@ void Window::_update_window_size() { } 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); + DisplayServer::get_singleton()->window_set_max_size(max_size, window_id); } //update the viewport |