summaryrefslogtreecommitdiff
path: root/scene/main
diff options
context:
space:
mode:
authorNikola Bunjevac <nikola.bunjevac@gmail.com>2022-10-10 21:24:28 +0200
committerNikola Bunjevac <nikola.bunjevac@gmail.com>2022-10-11 17:16:20 +0200
commitd7e9b8af9a28a49e8d2a0d1aaa89cdce8a50277a (patch)
treec757f3d6f621acc4f230a97f06d2a74bf26640a4 /scene/main
parentfb673953ca5a61389e92474a1f966ce37cbc4499 (diff)
Set window size after setting new limits
Otherwise this can fail as the size may not fit into current limits. This is problematic at least on X11.
Diffstat (limited to 'scene/main')
-rw-r--r--scene/main/window.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/main/window.cpp b/scene/main/window.cpp
index 7fb3f32d36..9df8ed40e9 100644
--- a/scene/main/window.cpp
+++ b/scene/main/window.cpp
@@ -651,9 +651,9 @@ void Window::_update_window_size() {
DisplayServer::get_singleton()->window_set_min_size(Size2i(), window_id);
}
- DisplayServer::get_singleton()->window_set_size(size, window_id);
DisplayServer::get_singleton()->window_set_max_size(max_size_valid ? max_size : Size2i(), window_id);
DisplayServer::get_singleton()->window_set_min_size(size_limit, window_id);
+ DisplayServer::get_singleton()->window_set_size(size, window_id);
}
//update the viewport