noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge pull request #120592 from Thought-Weaver/users/loganapple/asset-store-tooltip-fix

Browse Source 
[Asset Store][Editor Main Plugins] Rename Asset Store shortcut key
This commit is contained in:
Thaddeus Crews
2026-06-26 08:50:33 -05:00
parent 098e1959b8 6c6edff204
commit a1ebca4de7
4 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
editor/editor_main_screen.cpp
+1 -1
View File
@@ -266,7 +266,7 @@ void EditorMainScreen::add_main_plugin(EditorPlugin *p_editor) {
tb->set_name(p_editor->get_plugin_name());
tb->set_text(p_editor->get_plugin_name());
Ref<Shortcut> shortcut = EditorSettings::get_singleton()->get_shortcut("editor/editor_" + p_editor->get_plugin_name().to_lower());
Ref<Shortcut> shortcut = EditorSettings::get_singleton()->get_shortcut("editor/editor_" + p_editor->get_plugin_name().to_lower().replace_char(' ', '_'));
if (shortcut.is_valid()) {
tb->set_shortcut(shortcut);
}
editor/editor_node.cpp
+3 -3
View File
@@ -425,7 +425,7 @@ void EditorNode::shortcut_input(const Ref<InputEvent> &p_event) {
editor_main_screen->select(EditorMainScreen::EDITOR_GAME);
} else if (ED_IS_SHORTCUT("editor/editor_help", p_event)) {
emit_signal(SNAME("request_help_search"), "");
} else if (ED_IS_SHORTCUT("editor/editor_assetlib", p_event) && AssetLibraryEditorPlugin::is_available()) {
} else if (ED_IS_SHORTCUT("editor/editor_asset_store", p_event) && AssetLibraryEditorPlugin::is_available()) {
editor_main_screen->select(EditorMainScreen::EDITOR_ASSETLIB);
} else if (ED_IS_SHORTCUT("editor/editor_next", p_event)) {
editor_main_screen->select_next();
@@ -9057,13 +9057,13 @@ EditorNode::EditorNode() {
ED_SHORTCUT_AND_COMMAND("editor/editor_3d", TTRC("Open 3D Workspace"), KeyModifierMask::CTRL | Key::F2);
ED_SHORTCUT_AND_COMMAND("editor/editor_script", TTRC("Open Script Editor"), KeyModifierMask::CTRL | Key::F3);
ED_SHORTCUT_AND_COMMAND("editor/editor_game", TTRC("Open Game View"), KeyModifierMask::CTRL | Key::F4);
ED_SHORTCUT_AND_COMMAND("editor/editor_assetlib", TTRC("Open Asset Store"), KeyModifierMask::CTRL | Key::F5);
ED_SHORTCUT_AND_COMMAND("editor/editor_asset_store", TTRC("Open Asset Store"), KeyModifierMask::CTRL | Key::F5);
ED_SHORTCUT_OVERRIDE("editor/editor_2d", "macos", KeyModifierMask::META | KeyModifierMask::CTRL | Key::KEY_1);
ED_SHORTCUT_OVERRIDE("editor/editor_3d", "macos", KeyModifierMask::META | KeyModifierMask::CTRL | Key::KEY_2);
ED_SHORTCUT_OVERRIDE("editor/editor_script", "macos", KeyModifierMask::META | KeyModifierMask::CTRL | Key::KEY_3);
ED_SHORTCUT_OVERRIDE("editor/editor_game", "macos", KeyModifierMask::META | KeyModifierMask::CTRL | Key::KEY_4);
ED_SHORTCUT_OVERRIDE("editor/editor_assetlib", "macos", KeyModifierMask::META | KeyModifierMask::CTRL | Key::KEY_5);
ED_SHORTCUT_OVERRIDE("editor/editor_asset_store", "macos", KeyModifierMask::META | KeyModifierMask::CTRL | Key::KEY_5);
ED_SHORTCUT_AND_COMMAND("editor/editor_next", TTRC("Open the next Editor"));
ED_SHORTCUT_AND_COMMAND("editor/editor_prev", TTRC("Open the previous Editor"));
editor/settings/editor_settings.cpp
+13
View File
@@ -1339,6 +1339,9 @@ void EditorSettings::_handle_setting_compatibility() {
_rename_setting("interface/editor/update_continuously", "interface/editor/display/update_continuously");
_rename_setting("interface/editor/collapse_main_menu", "interface/editor/appearance/collapse_main_menu");
_rename_setting("asset_library/use_threads", "asset_store/use_threads");
// Handle renamed shortcuts.
_rename_shortcut("editor/editor_assetlib", "editor/editor_asset_store");
}
void EditorSettings::_rename_setting(const String &p_old_name, const String &p_new_name) {
@@ -1352,6 +1355,16 @@ void EditorSettings::_rename_setting(const String &p_old_name, const String &p_n
}
compat_map[p_old_name] = p_new_name;
}
void EditorSettings::_rename_shortcut(const String &p_old_path, const String &p_new_path) {
if (!shortcuts.has(p_old_path)) {
return;
}
if (!shortcuts.has(p_new_path)) {
shortcuts[p_new_path] = shortcuts[p_old_path];
}
shortcuts.erase(p_old_path);
}
#endif
// PUBLIC METHODS
editor/settings/editor_settings.h
+1
View File
@@ -128,6 +128,7 @@ private:
HashMap<String, String> compat_map;
void _handle_setting_compatibility();
void _rename_setting(const String &p_old_name, const String &p_new_name);
void _rename_shortcut(const String &p_old_path, const String &p_new_path);
#endif
// Bind helpers.