godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Merge pull request #100745 from mdelorme/mdelorme/issue_100727 

Assign the project manager title to the node instead of DisplayServer
This commit is contained in:
Thaddeus Crews 2024-12-30 08:58:23 -06:00
parent 888883d608 e4e966b0f2
commit 01c6e18963
No known key found for this signature in database
GPG Key ID: 62181B86FE9E5D84
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editor/project_manager.cpp
View File

@ -1139,7 +1139,7 @@ ProjectManager::ProjectManager() {
} }
// TRANSLATORS: This refers to the application where users manage their Godot projects. // TRANSLATORS: This refers to the application where users manage their Godot projects.
DisplayServer::get_singleton()->window_set_title(VERSION_NAME + String(" - ") + TTR("Project Manager", "Application")); SceneTree::get_singleton()->get_root()->set_title(VERSION_NAME + String(" - ") + TTR("Project Manager", "Application"));
SceneTree::get_singleton()->get_root()->connect("files_dropped", callable_mp(this, &ProjectManager::_files_dropped)); SceneTree::get_singleton()->get_root()->connect("files_dropped", callable_mp(this, &ProjectManager::_files_dropped));

15
scene/main/window.cpp
View File

@ -282,11 +282,13 @@ void Window::set_title(const String &p_title) {
title = p_title; title = p_title;
tr_title = atr(p_title); tr_title = atr(p_title);
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
if (window_id == DisplayServer::MAIN_WINDOW_ID) { if (window_id == DisplayServer::MAIN_WINDOW_ID && !Engine::get_singleton()->is_project_manager_hint()) {
// Append a suffix to the window title to denote that the project is running // Append a suffix to the window title to denote that the project is running
// from a debug build (including the editor). Since this results in lower performance, // from a debug build (including the editor, excluding the project manager).
// this should be clearly presented to the user. // Since this results in lower performance, this should be clearly presented
// to the user.
tr_title = vformat("%s (DEBUG)", tr_title); tr_title = vformat("%s (DEBUG)", tr_title);
} }
#endif #endif
@ -1435,10 +1437,11 @@ void Window::_notification(int p_what) {
tr_title = atr(title); tr_title = atr(title);
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
if (window_id == DisplayServer::MAIN_WINDOW_ID) { if (window_id == DisplayServer::MAIN_WINDOW_ID && !Engine::get_singleton()->is_project_manager_hint()) {
// Append a suffix to the window title to denote that the project is running // Append a suffix to the window title to denote that the project is running
// from a debug build (including the editor). Since this results in lower performance, // from a debug build (including the editor, excluding the project manager).
// this should be clearly presented to the user. // Since this results in lower performance, this should be clearly presented
// to the user.
tr_title = vformat("%s (DEBUG)", tr_title); tr_title = vformat("%s (DEBUG)", tr_title);
} }
#endif #endif