Merge pull request #6 from steveruizok/shortcut

Adds global shortcut (Command + Shift + R)
steveruizok · Feb 18, 2021 · 9848d48 · 9848d48
2 parents a160879 + 51d59b4
commit 9848d48
Show file tree

Hide file tree

Showing 5 changed files with 84 additions and 29 deletions.
diff --git a/app/background.js b/app/background.js
diff --git a/app/background.js.map b/app/background.js.map
diff --git a/main/background.js b/main/background.js
@@ -1,4 +1,4 @@
-import { app, screen } from "electron"
+import { app, globalShortcut } from "electron"
 import serve from "electron-serve"
 import { createWindow } from "./helpers"
 
@@ -13,17 +13,7 @@ if (isProd) {
 ;(async () => {
   await app.whenReady()
 
-  app.on("browser-window-focus", () => {
-    if (mainWindow) {
-      mainWindow.webContents.send("projectMsg", { eventName: "FOCUSED_WINDOW" })
-    }
-  })
-
-  app.on("browser-window-blur", () => {
-    if (mainWindow) {
-      mainWindow.webContents.send("projectMsg", { eventName: "BLURRED_WINDOW" })
-    }
-  })
+  // Create window
 
   const mainWindow = createWindow("main", {
     fullscreenable: false,
@@ -42,6 +32,44 @@ if (isProd) {
   mainWindow.setAlwaysOnTop(true, "floating")
   mainWindow.setResizable(false)
 
+  // Window events
+
+  app.on("browser-window-focus", () => {
+    if (mainWindow) {
+      mainWindow.webContents.send("projectMsg", { eventName: "FOCUSED_WINDOW" })
+    }
+  })
+
+  app.on("browser-window-blur", () => {
+    if (mainWindow) {
+      mainWindow.webContents.send("projectMsg", { eventName: "BLURRED_WINDOW" })
+    }
+  })
+
+  // Setup global shortcut
+
+  app.whenReady().then(() => {
+    // Register a 'CommandOrControl+X' shortcut listener.
+    const ret = globalShortcut.register("CommandOrControl+Shift+R", () => {
+      app.focus({ steal: true })
+      mainWindow.webContents.focus()
+      mainWindow.webContents.send("projectMsg", {
+        eventName: "ACTIVATE_SHORTCUT",
+      })
+    })
+
+    if (!ret) {
+      console.warn("Shortcut registration failed.")
+    }
+  })
+
+  app.on("will-quit", () => {
+    // Unregister all shortcuts.
+    globalShortcut.unregisterAll()
+  })
+
+  // Kickoff
+
   if (isProd) {
     await mainWindow.loadURL("app://./home.html")
   } else {

diff --git a/renderer/lib/state.ts b/renderer/lib/state.ts
@@ -91,6 +91,9 @@ const state = createState({
             inactive: {
               onEnter: ["clearCurrentMark", "deactivate"],
               on: {
+                ACTIVATE_SHORTCUT: {
+                  to: ["active", "drawing"],
+                },
                 ACTIVATED: { to: "active" },
                 ENTERED_CONTROLS: { to: "selecting" },
               },

diff --git a/renderer/pages/_app.tsx b/renderer/pages/_app.tsx
@@ -1,4 +1,5 @@
 import styled from "styled-components"
+import Head from "next/head"
 import GlobalStyles from "../styles/globals"
 import usePointer from "hooks/usePointer"
 import useWindowEvents from "hooks/useWindowEvents"