Skip to content

Commit 3f8cc66

Browse files
committed
[Windows] Improve editor grouping, set friendly name registry key for exported projects.
1 parent 3e0c10d commit 3f8cc66

File tree

1 file changed

+13
-2
lines changed

1 file changed

+13
-2
lines changed

platform/windows/display_server_windows.cpp

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5543,7 +5543,7 @@ DisplayServer::WindowID DisplayServerWindows::_create_window(WindowMode p_mode,
55435543
PROPVARIANT val;
55445544
String appname;
55455545
if (Engine::get_singleton()->is_editor_hint()) {
5546-
appname = "Godot.GodotEditor." + String(VERSION_BRANCH);
5546+
appname = "Godot.GodotEditor." + String(VERSION_FULL_CONFIG);
55475547
} else {
55485548
String name = GLOBAL_GET("application/config/name");
55495549
String version = GLOBAL_GET("application/config/version");
@@ -6070,7 +6070,7 @@ DisplayServerWindows::DisplayServerWindows(const String &p_rendering_driver, Win
60706070

60716071
String appname;
60726072
if (Engine::get_singleton()->is_editor_hint()) {
6073-
appname = "Godot.GodotEditor." + String(VERSION_BRANCH);
6073+
appname = "Godot.GodotEditor." + String(VERSION_FULL_CONFIG);
60746074
} else {
60756075
String name = GLOBAL_GET("application/config/name");
60766076
String version = GLOBAL_GET("application/config/version");
@@ -6085,6 +6085,17 @@ DisplayServerWindows::DisplayServerWindows(const String &p_rendering_driver, Win
60856085
}
60866086
clean_app_name = clean_app_name.substr(0, 120 - version.length()).trim_suffix(".");
60876087
appname = "Godot." + clean_app_name + "." + version;
6088+
6089+
#ifndef TOOLS_ENABLED
6090+
// Set for exported projects only.
6091+
HKEY key;
6092+
if (RegOpenKeyW(HKEY_CURRENT_USER_LOCAL_SETTINGS, L"Software\\Microsoft\\Windows\\Shell\\MuiCache", &key) == ERROR_SUCCESS) {
6093+
Char16String cs_name = name.utf16();
6094+
String value_name = OS::get_singleton()->get_executable_path().replace("/", "\\") + ".FriendlyAppName";
6095+
RegSetValueExW(key, (LPCWSTR)value_name.utf16().get_data(), 0, REG_SZ, (const BYTE *)cs_name.get_data(), cs_name.size() * sizeof(WCHAR));
6096+
RegCloseKey(key);
6097+
}
6098+
#endif
60886099
}
60896100
SetCurrentProcessExplicitAppUserModelID((PCWSTR)appname.utf16().get_data());
60906101

0 commit comments

Comments
 (0)