Switch between metaKey and ctrlKey by platform (closes #307)

Mechanical-Advantage · Jan 11, 2025 · 5071e10 · 5071e10
1 parent 5a04593
commit 5071e10
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/src/hub/SelectionImpl.ts b/src/hub/SelectionImpl.ts
@@ -61,7 +61,11 @@ export default class SelectionImpl implements Selection {
         case "ArrowLeft":
         case "ArrowRight":
           // Unlocked video uses arrow keys to navigate by frame
-          if (window.tabs.isUnlockedVideoSelected() || this.mode !== SelectionMode.Static || event.metaKey) {
+          if (
+            window.tabs.isUnlockedVideoSelected() ||
+            this.mode !== SelectionMode.Static ||
+            (window.platform === "darwin" ? event.metaKey : event.ctrlKey)
+          ) {
             return;
           }
 

diff --git a/src/hub/controllers/VideoController.ts b/src/hub/controllers/VideoController.ts
@@ -171,7 +171,13 @@ export default class VideoController implements TabController {
     this.SKIP_BACK_BUTTON.addEventListener("click", () => skipTime(-5));
     this.SKIP_FORWARD_BUTTON.addEventListener("click", () => skipTime(5));
     window.addEventListener("keydown", (event) => {
-      if (root === null || root.hidden || event.target !== document.body || event.metaKey) return;
+      if (
+        root === null ||
+        root.hidden ||
+        event.target !== document.body ||
+        (window.platform === "darwin" ? event.metaKey : event.ctrlKey)
+      )
+        return;
       switch (event.code) {
         case "ArrowUp":
         case "ArrowDown":

diff --git a/src/shared/renderers/ConsoleRenderer.ts b/src/shared/renderers/ConsoleRenderer.ts
@@ -108,7 +108,7 @@ export default class ConsoleRenderer implements TabRenderer {
     // Select filter
     window.addEventListener("keydown", (event) => {
       if (root === null || root.hidden || event.target !== document.body) return;
-      if (event.metaKey && event.key === "f") {
+      if ((window.platform === "darwin" ? event.metaKey : event.ctrlKey) && event.key === "f") {
         this.FILTER_INPUT.select();
       }
     });

diff --git a/src/shared/renderers/ThreeDimensionRendererImpl.ts b/src/shared/renderers/ThreeDimensionRendererImpl.ts
@@ -254,7 +254,7 @@ export default class ThreeDimensionRendererImpl implements TabRenderer {
 
     // Create key bindings
     window.addEventListener("keydown", (event) => {
-      if (event.metaKey) return;
+      if (window.platform === "darwin" ? event.metaKey : event.ctrlKey) return;
       if (event.target !== document.body) return;
       if (canvasContainer.clientHeight === 0) return;
       this.keysPressed.add(event.code);