godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Fix project manager window size when EDSCALE is not 1.0.

Browse Source
This commit is contained in:
Pāvels Nadtočajevs
2025-01-15 12:25:41 +02:00
parent 4ce466d7fa
commit 934668a69a
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
editor/project_manager.cpp
View File

@@ -149,7 +149,7 @@ void ProjectManager::_build_icon_type_cache(Ref<Theme> p_theme) {
// Main layout. // Main layout.
void ProjectManager::_update_size_limits() { void ProjectManager::_update_size_limits(bool p_custom_res) {
const Size2 minimum_size = Size2(720, 450) * EDSCALE; const Size2 minimum_size = Size2(720, 450) * EDSCALE;
const Size2 default_size = Size2(DEFAULT_WINDOW_WIDTH, DEFAULT_WINDOW_HEIGHT) * EDSCALE; const Size2 default_size = Size2(DEFAULT_WINDOW_WIDTH, DEFAULT_WINDOW_HEIGHT) * EDSCALE;
@@ -159,20 +159,21 @@ void ProjectManager::_update_size_limits() {
// Calling Window methods this early doesn't sync properties with DS. // Calling Window methods this early doesn't sync properties with DS.
w->set_min_size(minimum_size); w->set_min_size(minimum_size);
DisplayServer::get_singleton()->window_set_min_size(minimum_size); DisplayServer::get_singleton()->window_set_min_size(minimum_size);
if (DisplayServer::get_singleton()->window_get_size() == default_size) { if (!p_custom_res) {
// Only set window size if it currently matches the default, which is defined in `main/main.cpp`. // Only set window size if it currently matches the default, which is defined in `main/main.cpp`.
// This allows CLI arguments to override the window size. // This allows CLI arguments to override the window size.
w->set_size(default_size); w->set_size(default_size);
DisplayServer::get_singleton()->window_set_size(default_size); DisplayServer::get_singleton()->window_set_size(default_size);
} }
} }
Size2 real_size = DisplayServer::get_singleton()->window_get_size();
Rect2i screen_rect = DisplayServer::get_singleton()->screen_get_usable_rect(DisplayServer::get_singleton()->window_get_current_screen()); Rect2i screen_rect = DisplayServer::get_singleton()->screen_get_usable_rect(DisplayServer::get_singleton()->window_get_current_screen());
if (screen_rect.size != Vector2i()) { if (screen_rect.size != Vector2i()) {
// Center the window on the screen. // Center the window on the screen.
Vector2i window_position; Vector2i window_position;
window_position.x = screen_rect.position.x + (screen_rect.size.x - default_size.x) / 2; window_position.x = screen_rect.position.x + (screen_rect.size.x - real_size.x) / 2;
window_position.y = screen_rect.position.y + (screen_rect.size.y - default_size.y) / 2; window_position.y = screen_rect.position.y + (screen_rect.size.y - real_size.y) / 2;
DisplayServer::get_singleton()->window_set_position(window_position); DisplayServer::get_singleton()->window_set_position(window_position);
// Limit popup menus to prevent unusably long lists. // Limit popup menus to prevent unusably long lists.
@@ -1152,7 +1153,7 @@ void ProjectManager::_titlebar_resized() {
// Object methods. // Object methods.
ProjectManager::ProjectManager() { ProjectManager::ProjectManager(bool p_custom_res) {
singleton = this; singleton = this;
set_translation_domain("godot.editor"); set_translation_domain("godot.editor");
@@ -1740,7 +1741,7 @@ ProjectManager::ProjectManager() {
title_bar->connect(SceneStringName(item_rect_changed), callable_mp(this, &ProjectManager::_titlebar_resized)); title_bar->connect(SceneStringName(item_rect_changed), callable_mp(this, &ProjectManager::_titlebar_resized));
} }
_update_size_limits(); _update_size_limits(p_custom_res);
} }
ProjectManager::~ProjectManager() { ProjectManager::~ProjectManager() {

4
editor/project_manager.h
View File

@@ -70,7 +70,7 @@ class ProjectManager : public Control {
Ref<Theme> theme; Ref<Theme> theme;
void _update_size_limits(); void _update_size_limits(bool p_custom_res);
void _update_theme(bool p_skip_creation = false); void _update_theme(bool p_skip_creation = false);
void _titlebar_resized(); void _titlebar_resized();
@@ -262,7 +262,7 @@ public:
void add_new_tag(const String &p_tag); void add_new_tag(const String &p_tag);
ProjectManager(); ProjectManager(bool p_custom_res);
~ProjectManager(); ~ProjectManager();
}; };

6
main/main.cpp
View File

@@ -230,6 +230,8 @@ static bool init_use_custom_pos = false;
static bool init_use_custom_screen = false; static bool init_use_custom_screen = false;
static Vector2 init_custom_pos; static Vector2 init_custom_pos;
static int64_t init_embed_parent_window_id = 0; static int64_t init_embed_parent_window_id = 0;
static bool use_custom_res = true;
static bool force_res = false;
// Debug // Debug
@@ -1019,8 +1021,6 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
String remotefs_pass; String remotefs_pass;
Vector<String> breakpoints; Vector<String> breakpoints;
bool use_custom_res = true;
bool force_res = false;
bool delta_smoothing_override = false; bool delta_smoothing_override = false;
String default_renderer = ""; String default_renderer = "";
@@ -4318,7 +4318,7 @@ int Main::start() {
translation_server->get_editor_domain()->set_pseudolocalization_enabled(true); translation_server->get_editor_domain()->set_pseudolocalization_enabled(true);
} }
ProjectManager *pmanager = memnew(ProjectManager); ProjectManager *pmanager = memnew(ProjectManager(force_res || use_custom_res));
ProgressDialog *progress_dialog = memnew(ProgressDialog); ProgressDialog *progress_dialog = memnew(ProgressDialog);
pmanager->add_child(progress_dialog); pmanager->add_child(progress_dialog);