summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2021-08-11 17:36:04 +0200
committerGitHub <noreply@github.com>2021-08-11 17:36:04 +0200
commit2559089b6f3c7d5ada63b90d6632c96a24ccd400 (patch)
treea07b0f192f84880e9dff26f2bff6cddfa9b49018
parent62047e4e4848e511a5f4e0aa84bc4f512f075f8d (diff)
parentd2b6125a6aec5b53d2e0fd7ee0073a4ca9884015 (diff)
Merge pull request #51515 from Bhu1-V/PR/shortcut-fix
corrected method name `set_event`
-rw-r--r--editor/settings_config_dialog.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/editor/settings_config_dialog.cpp b/editor/settings_config_dialog.cpp
index e7ba3daccd..5c77c9f124 100644
--- a/editor/settings_config_dialog.cpp
+++ b/editor/settings_config_dialog.cpp
@@ -208,8 +208,8 @@ void EditorSettingsDialog::_event_config_confirmed() {
Ref<Shortcut> current_sc = EditorSettings::get_singleton()->get_shortcut(shortcut_being_edited);
undo_redo->create_action(TTR("Change Shortcut") + " '" + shortcut_being_edited + "'");
- undo_redo->add_do_method(current_sc.ptr(), "set_shortcut", k);
- undo_redo->add_undo_method(current_sc.ptr(), "set_shortcut", current_sc->get_event());
+ undo_redo->add_do_method(current_sc.ptr(), "set_event", k);
+ undo_redo->add_undo_method(current_sc.ptr(), "set_event", current_sc->get_event());
undo_redo->add_do_method(this, "_update_shortcuts");
undo_redo->add_undo_method(this, "_update_shortcuts");
undo_redo->add_do_method(this, "_settings_changed");
@@ -453,8 +453,8 @@ void EditorSettingsDialog::_shortcut_button_pressed(Object *p_item, int p_column
}
undo_redo->create_action(TTR("Erase Shortcut"));
- undo_redo->add_do_method(sc.ptr(), "set_shortcut", Ref<InputEvent>());
- undo_redo->add_undo_method(sc.ptr(), "set_shortcut", sc->get_event());
+ undo_redo->add_do_method(sc.ptr(), "set_event", Ref<InputEvent>());
+ undo_redo->add_undo_method(sc.ptr(), "set_event", sc->get_event());
undo_redo->add_do_method(this, "_update_shortcuts");
undo_redo->add_undo_method(this, "_update_shortcuts");
undo_redo->add_do_method(this, "_settings_changed");
@@ -469,8 +469,8 @@ void EditorSettingsDialog::_shortcut_button_pressed(Object *p_item, int p_column
Ref<InputEvent> original = sc->get_meta("original");
undo_redo->create_action(TTR("Restore Shortcut"));
- undo_redo->add_do_method(sc.ptr(), "set_shortcut", original);
- undo_redo->add_undo_method(sc.ptr(), "set_shortcut", sc->get_event());
+ undo_redo->add_do_method(sc.ptr(), "set_event", original);
+ undo_redo->add_undo_method(sc.ptr(), "set_event", sc->get_event());
undo_redo->add_do_method(this, "_update_shortcuts");
undo_redo->add_undo_method(this, "_update_shortcuts");
undo_redo->add_do_method(this, "_settings_changed");