fix: event pattern on other platform

CyanSalt · Jan 12, 2021 · 64ce72a · 64ce72a
1 parent 8ddcb3c
commit 64ce72a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/renderer/hooks/terminal.ts b/renderer/hooks/terminal.ts
@@ -140,7 +140,6 @@ export async function createTerminalTab({ cwd, shell: shellPath, launcher }: Cre
     updateCwd()
   })
   watch(terminalOptionsRef, (terminalOptions) => {
-    if (tab.pane) return
     const latestXterm = tab.xterm
     for (const [key, value] of Object.entries(terminalOptions)) {
       latestXterm.setOption(key, value)

diff --git a/renderer/utils/accelerator.ts b/renderer/utils/accelerator.ts
@@ -23,7 +23,11 @@ export function toKeyEventPattern(accelerator: string) {
         break
       case 'CmdOrCtrl':
       case 'CommandOrCtrl':
-        pattern.metaKey = true
+        if (process.platform === 'darwin') {
+          pattern.metaKey = true
+        } else {
+          pattern.ctrlKey = true
+        }
         break
       default:
         pattern.key = key.length === 1 ? key.toLowerCase() : key