Sancaros/phantasmal-world
1
0
Fork 0
mirror of https://github.com/DaanVandenBosch/phantasmal-world.git synced 2025-04-06 08:08:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Ctrl-Z and Ctrl-Shift-Z undo and redo commands now work more consistently.

Browse Source
This commit is contained in:
Daan Vanden Bosch 2019-09-15 18:34:24 +02:00
parent 7ec05ac9a1
commit da622aab61
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/stores/GuiStore.ts
View File

@ -25,7 +25,7 @@ class GuiStore implements Disposable {
private readonly hash_disposer = this.tool.observe(({ value: tool }) => { private readonly hash_disposer = this.tool.observe(({ value: tool }) => {
window.location.hash = `#/${gui_tool_to_string(tool)}`; window.location.hash = `#/${gui_tool_to_string(tool)}`;
}); });
private readonly global_keydown_handlers = new Map<string, () => void>(); private readonly global_keydown_handlers = new Map<string, (e: KeyboardEvent) => void>();
constructor() { constructor() {
const tool = window.location.hash.slice(2); const tool = window.location.hash.slice(2);
@ -43,7 +43,7 @@ class GuiStore implements Disposable {
window.removeEventListener("keydown", this.dispatch_global_keydown); window.removeEventListener("keydown", this.dispatch_global_keydown);
} }
on_global_keydown(tool: GuiTool, binding: string, handler: () => void): Disposable { on_global_keydown(tool: GuiTool, binding: string, handler: (e: KeyboardEvent) => void): Disposable {
const key = this.handler_key(tool, binding); const key = this.handler_key(tool, binding);
this.global_keydown_handlers.set(key, handler); this.global_keydown_handlers.set(key, handler);
@ -67,7 +67,7 @@ class GuiStore implements Disposable {
if (handler) { if (handler) {
e.preventDefault(); e.preventDefault();
handler(); handler(e);
} }
}; };

5
src/quest_editor/gui/AsmEditorView.ts
View File

@ -1,6 +1,6 @@
import { ResizableWidget } from "../../core/gui/ResizableWidget"; import { ResizableWidget } from "../../core/gui/ResizableWidget";
import { el } from "../../core/gui/dom"; import { el } from "../../core/gui/dom";
import { editor } from "monaco-editor"; import { editor, KeyCode, KeyMod } from "monaco-editor";
import { asm_editor_store } from "../stores/AsmEditorStore"; import { asm_editor_store } from "../stores/AsmEditorStore";
import IStandaloneCodeEditor = editor.IStandaloneCodeEditor; import IStandaloneCodeEditor = editor.IStandaloneCodeEditor;
@ -45,6 +45,9 @@ export class AsmEditorView extends ResizableWidget {
}), }),
); );
this.editor.addCommand(KeyMod.CtrlCmd | KeyCode.KEY_Z, () => {});
this.editor.addCommand(KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_Z, () => {});
this.disposables( this.disposables(
asm_editor_store.did_undo.observe(({ value: source }) => { asm_editor_store.did_undo.observe(({ value: source }) => {
this.editor.trigger(source, "undo", undefined); this.editor.trigger(source, "undo", undefined);

10
src/quest_editor/gui/QuestEditorToolBar.ts
View File

@ -120,17 +120,11 @@ export class QuestEditorToolBar extends ToolBar {
), ),
gui_store.on_global_keydown(GuiTool.QuestEditor, "Ctrl-Z", () => { gui_store.on_global_keydown(GuiTool.QuestEditor, "Ctrl-Z", () => {
// Let Monaco handle its own key bindings. undo_manager.undo();
if (undo_manager.current.val !== asm_editor_store.undo) {
undo_manager.undo();
}
}), }),
gui_store.on_global_keydown(GuiTool.QuestEditor, "Ctrl-Shift-Z", () => { gui_store.on_global_keydown(GuiTool.QuestEditor, "Ctrl-Shift-Z", () => {
// Let Monaco handle its own key bindings. undo_manager.redo();
if (undo_manager.current.val !== asm_editor_store.undo) {
undo_manager.redo();
}
}), }),
); );