mirrors/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-01-22 18:43:29 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #100120 from allenwp/make-editor-shortcuts-global

Browse source 
Force fixed undo history to make editor shortcuts use global history.
This commit is contained in:
Thaddeus Crews 2024-12-12 16:13:34 -06:00
commit 91dc363dca
No known key found for this signature in database
GPG key ID: 62181B86FE9E5D84
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
editor/editor_settings_dialog.cpp
View file

@ -349,7 +349,10 @@ void EditorSettingsDialog::_update_shortcut_events(const String &p_path, const A
Ref<Shortcut> current_sc = EditorSettings::get_singleton()->get_shortcut(p_path);
EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
undo_redo->create_action(vformat(TTR("Edit Shortcut: %s"), p_path));
undo_redo->create_action(vformat(TTR("Edit Shortcut: %s"), p_path), UndoRedo::MERGE_DISABLE, EditorSettings::get_singleton());
// History must be fixed based on the EditorSettings object because current_sc would
// incorrectly make this action use the scene history.
undo_redo->force_fixed_history();
undo_redo->add_do_method(current_sc.ptr(), "set_events", p_events);
undo_redo->add_undo_method(current_sc.ptr(), "set_events", current_sc->get_events());
undo_redo->add_do_method(EditorSettings::get_singleton(), "mark_setting_changed", "shortcuts");