From 0425faec8131b17251e7cf845084ea9c35cf21d7 Mon Sep 17 00:00:00 2001 From: Daan Vanden Bosch Date: Sat, 25 Apr 2020 20:54:42 +0200 Subject: [PATCH] Fixed bug that prevented ctrl-z and ctrl-shift-z from working in the ASM editor. --- .../controllers/QuestEditorToolBarController.ts | 4 ++++ src/quest_editor/gui/AsmEditorView.ts | 10 ---------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/quest_editor/controllers/QuestEditorToolBarController.ts b/src/quest_editor/controllers/QuestEditorToolBarController.ts index 8f0ad9ec..7a92ba34 100644 --- a/src/quest_editor/controllers/QuestEditorToolBarController.ts +++ b/src/quest_editor/controllers/QuestEditorToolBarController.ts @@ -131,6 +131,10 @@ export class QuestEditorToolBarController extends Controller { undo_manager.redo(); }), + gui_store.on_global_keydown(GuiTool.QuestEditor, "Ctrl-Y", () => { + undo_manager.redo(); + }), + gui_store.on_global_keydown(GuiTool.QuestEditor, "F5", this.debug), gui_store.on_global_keydown(GuiTool.QuestEditor, "Shift-F5", this.stop), diff --git a/src/quest_editor/gui/AsmEditorView.ts b/src/quest_editor/gui/AsmEditorView.ts index 4921454d..f9d9ed1e 100644 --- a/src/quest_editor/gui/AsmEditorView.ts +++ b/src/quest_editor/gui/AsmEditorView.ts @@ -68,15 +68,6 @@ export class AsmEditorView extends ResizableView { this.history = this.disposable(new EditorHistory(this.editor)); - // Commands and actions. - this.editor.addCommand(KeyMod.CtrlCmd | KeyCode.KEY_Z, () => { - // Do nothing. - }); - - this.editor.addCommand(KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_Z, () => { - // Do nothing. - }); - const quick_command = this.editor.getAction("editor.action.quickCommand"); this.disposables( @@ -88,7 +79,6 @@ export class AsmEditorView extends ResizableView { }), ); - // Undo/Redo this.disposables( asm_editor_store.did_undo.observe(({ value: source }) => { this.editor.trigger(source, "undo", undefined);