summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2022-10-11 23:26:37 +0200
committerGitHub <noreply@github.com>2022-10-11 23:26:37 +0200
commit3229194dfc6a03cceb8f544211ae71a0f1524987 (patch)
treea1bd1c616af75ed68dbe3c40086966b3991c3f68
parent927bcfe646f045c984707b800f5f49f0e026b793 (diff)
parentd7e9b8af9a28a49e8d2a0d1aaa89cdce8a50277a (diff)
Merge pull request #67215 from Nidjo123/project-dialog-resize
Resize project dialog only when necessary
-rw-r--r--editor/project_manager.cpp6
-rw-r--r--scene/main/window.cpp2
2 files changed, 6 insertions, 2 deletions
diff --git a/editor/project_manager.cpp b/editor/project_manager.cpp
index c6fcdc890c..5a1eedd8a2 100644
--- a/editor/project_manager.cpp
+++ b/editor/project_manager.cpp
@@ -143,7 +143,11 @@ private:
install_status_rect->set_texture(new_icon);
}
- set_size(Size2(500, 0) * EDSCALE);
+ Size2i window_size = get_size();
+ Size2 contents_min_size = get_contents_minimum_size();
+ if (window_size.x < contents_min_size.x || window_size.y < contents_min_size.y) {
+ set_size(window_size.max(contents_min_size));
+ }
}
String _test_path() {
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