diff options
| -rw-r--r-- | editor/project_manager.cpp | 7 | ||||
| -rw-r--r-- | scene/main/window.cpp | 10 |
2 files changed, 5 insertions, 12 deletions
diff --git a/editor/project_manager.cpp b/editor/project_manager.cpp index ed01187947..291484600c 100644 --- a/editor/project_manager.cpp +++ b/editor/project_manager.cpp @@ -101,12 +101,6 @@ void ProjectDialog::_set_message(const String &p_msg, MessageType p_type, InputT } else if (current_install_icon != new_icon && input_type == INSTALL_PATH) { install_status_rect->set_texture(new_icon); } - - 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 ProjectDialog::_test_path() { @@ -868,6 +862,7 @@ ProjectDialog::ProjectDialog() { msg = memnew(Label); msg->set_horizontal_alignment(HORIZONTAL_ALIGNMENT_CENTER); + msg->set_custom_minimum_size(Size2(200, 0) * EDSCALE); vb->add_child(msg); // Renderer selection. diff --git a/scene/main/window.cpp b/scene/main/window.cpp index afa69e0c49..a48a336718 100644 --- a/scene/main/window.cpp +++ b/scene/main/window.cpp @@ -967,6 +967,10 @@ Size2i Window::_clamp_window_size(const Size2i &p_size) { void Window::_update_window_size() { Size2i size_limit = get_clamped_minimum_size(); + if (!embedder && window_id != DisplayServer::INVALID_WINDOW_ID && keep_title_visible) { + Size2i title_size = DisplayServer::get_singleton()->window_get_title_size(tr_title, window_id); + size_limit = size_limit.max(title_size); + } size = size.max(size_limit); @@ -998,12 +1002,6 @@ void Window::_update_window_size() { } DisplayServer::get_singleton()->window_set_max_size(max_size_used, window_id); - - if (keep_title_visible) { - Size2i title_size = DisplayServer::get_singleton()->window_get_title_size(tr_title, window_id); - size_limit = size_limit.max(title_size); - } - DisplayServer::get_singleton()->window_set_min_size(size_limit, window_id); DisplayServer::get_singleton()->window_set_size(size, window_id); } |