summaryrefslogtreecommitdiffstats
path: root/scene/main/window.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'scene/main/window.cpp')
-rw-r--r--scene/main/window.cpp10
1 files changed, 7 insertions, 3 deletions
diff --git a/scene/main/window.cpp b/scene/main/window.cpp
index f8a86b0957..6c2e2f1d31 100644
--- a/scene/main/window.cpp
+++ b/scene/main/window.cpp
@@ -99,7 +99,9 @@ Size2i Window::get_real_size() const {
void Window::set_max_size(const Size2i &p_max_size) {
max_size = p_max_size;
- DisplayServer::get_singleton()->window_set_min_size(max_size, window_id);
+ 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 {
@@ -110,7 +112,9 @@ Size2i Window::get_max_size() const {
void Window::set_min_size(const Size2i &p_min_size) {
min_size = p_min_size;
- DisplayServer::get_singleton()->window_set_max_size(max_size, window_id);
+ if (window_id != DisplayServer::INVALID_WINDOW_ID) {
+ DisplayServer::get_singleton()->window_set_min_size(max_size, window_id);
+ }
_update_window_size();
}
Size2i Window::get_min_size() const {
@@ -270,8 +274,8 @@ void Window::_clear_window() {
DisplayServer::get_singleton()->delete_sub_window(window_id);
window_id = DisplayServer::INVALID_WINDOW_ID;
- _update_viewport_size();
+ _update_viewport_size();
VS::get_singleton()->viewport_set_update_mode(get_viewport_rid(), VS::VIEWPORT_UPDATE_DISABLED);
}