godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #86727 from KoBeWi/shortcut_revolution 

Update modified shortcuts in command palette
This commit is contained in:
Rémi Verschelde 2024-01-09 15:31:00 +01:00
parent 673102ffd8 b712d1c657
commit 8297ec949b
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
editor/editor_command_palette.cpp
View File

@ -74,7 +74,7 @@ void EditorCommandPalette::_update_command_search(const String &search_text) {
CommandEntry r; CommandEntry r;
r.key_name = E.key; r.key_name = E.key;
r.display_name = E.value.name; r.display_name = E.value.name;
r.shortcut_text = E.value.shortcut; r.shortcut_text = E.value.shortcut_text;
r.last_used = E.value.last_used; r.last_used = E.value.last_used;
bool is_subsequence_of_key_name = search_text.is_subsequence_ofn(r.key_name); bool is_subsequence_of_key_name = search_text.is_subsequence_ofn(r.key_name);
@ -166,6 +166,19 @@ void EditorCommandPalette::_notification(int p_what) {
case NOTIFICATION_THEME_CHANGED: { case NOTIFICATION_THEME_CHANGED: {
command_search_box->set_right_icon(get_editor_theme_icon(SNAME("Search"))); command_search_box->set_right_icon(get_editor_theme_icon(SNAME("Search")));
} break; } break;
case EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED: {
if (!EditorSettings::get_singleton()->check_changed_settings_in_group("shortcuts")) {
break;
}
for (KeyValue<String, Command> &kv : commands) {
Command &c = kv.value;
if (c.shortcut.is_valid()) {
c.shortcut_text = c.shortcut->get_as_text();
}
}
} break;
} }
} }
@ -219,7 +232,7 @@ void EditorCommandPalette::remove_command(String p_key_name) {
commands.erase(p_key_name); commands.erase(p_key_name);
} }
void EditorCommandPalette::add_command(String p_command_name, String p_key_name, Callable p_action, Vector<Variant> arguments, String p_shortcut_text) { void EditorCommandPalette::add_command(String p_command_name, String p_key_name, Callable p_action, Vector<Variant> arguments, const Ref<Shortcut> &p_shortcut) {
ERR_FAIL_COND_MSG(commands.has(p_key_name), "The Command '" + String(p_command_name) + "' already exists. Unable to add it."); ERR_FAIL_COND_MSG(commands.has(p_key_name), "The Command '" + String(p_command_name) + "' already exists. Unable to add it.");
const Variant **argptrs = (const Variant **)alloca(sizeof(Variant *) * arguments.size()); const Variant **argptrs = (const Variant **)alloca(sizeof(Variant *) * arguments.size());
@ -229,7 +242,12 @@ void EditorCommandPalette::add_command(String p_command_name, String p_key_name,
Command command; Command command;
command.name = p_command_name; command.name = p_command_name;
command.callable = p_action.bindp(argptrs, arguments.size()); command.callable = p_action.bindp(argptrs, arguments.size());
command.shortcut = p_shortcut_text; if (p_shortcut.is_null()) {
command.shortcut_text = "None";
} else {
command.shortcut = p_shortcut;
command.shortcut_text = p_shortcut->get_as_text();
}
commands[p_key_name] = command; commands[p_key_name] = command;
} }
@ -240,7 +258,7 @@ void EditorCommandPalette::_add_command(String p_command_name, String p_key_name
Command command; Command command;
command.name = p_command_name; command.name = p_command_name;
command.callable = p_binded_action; command.callable = p_binded_action;
command.shortcut = p_shortcut_text; command.shortcut_text = p_shortcut_text;
// Commands added from plugins don't exist yet when the history is loaded, so we assign the last use time here if it was recorded. // Commands added from plugins don't exist yet when the history is loaded, so we assign the last use time here if it was recorded.
Dictionary command_history = EditorSettings::get_singleton()->get_project_metadata("command_palette", "command_history", Dictionary()); Dictionary command_history = EditorSettings::get_singleton()->get_project_metadata("command_palette", "command_history", Dictionary());
@ -273,8 +291,7 @@ void EditorCommandPalette::register_shortcuts_as_command() {
Ref<InputEventShortcut> ev; Ref<InputEventShortcut> ev;
ev.instantiate(); ev.instantiate();
ev->set_shortcut(shortcut); ev->set_shortcut(shortcut);
String shortcut_text = String(shortcut->get_as_text()); add_command(command_name, E.key, callable_mp(EditorNode::get_singleton()->get_viewport(), &Viewport::push_input), varray(ev, false), shortcut);
add_command(command_name, E.key, callable_mp(EditorNode::get_singleton()->get_viewport(), &Viewport::push_input), varray(ev, false), shortcut_text);
} }
unregistered_shortcuts.clear(); unregistered_shortcuts.clear();
@ -294,8 +311,7 @@ Ref<Shortcut> EditorCommandPalette::add_shortcut_command(const String &p_command
Ref<InputEventShortcut> ev; Ref<InputEventShortcut> ev;
ev.instantiate(); ev.instantiate();
ev->set_shortcut(p_shortcut); ev->set_shortcut(p_shortcut);
String shortcut_text = String(p_shortcut->get_as_text()); add_command(p_command, p_key, callable_mp(EditorNode::get_singleton()->get_viewport(), &Viewport::push_input), varray(ev, false), p_shortcut);
add_command(p_command, p_key, callable_mp(EditorNode::get_singleton()->get_viewport(), &Viewport::push_input), varray(ev, false), shortcut_text);
} else { } else {
const String key_name = String(p_key); const String key_name = String(p_key);
const String command_name = String(p_command); const String command_name = String(p_command);

5
editor/editor_command_palette.h
View File

@ -46,7 +46,8 @@ class EditorCommandPalette : public ConfirmationDialog {
struct Command { struct Command {
Callable callable; Callable callable;
String name; String name;
String shortcut; Ref<Shortcut> shortcut;
String shortcut_text;
int last_used = 0; // Store time as int, because doubles have problems with text serialization. int last_used = 0; // Store time as int, because doubles have problems with text serialization.
}; };
@ -93,7 +94,7 @@ protected:
public: public:
void open_popup(); void open_popup();
void get_actions_list(List<String> *p_list) const; void get_actions_list(List<String> *p_list) const;
void add_command(String p_command_name, String p_key_name, Callable p_action, Vector<Variant> arguments, String p_shortcut_text = "None"); void add_command(String p_command_name, String p_key_name, Callable p_action, Vector<Variant> arguments, const Ref<Shortcut> &p_shortcut);
void execute_command(const String &p_command_name); void execute_command(const String &p_command_name);
void register_shortcuts_as_command(); void register_shortcuts_as_command();
Ref<Shortcut> add_shortcut_command(const String &p_command, const String &p_key, Ref<Shortcut> p_shortcut); Ref<Shortcut> add_shortcut_command(const String &p_command, const String &p_key, Ref<Shortcut> p_shortcut);