feat: use local shortcut for quit (#60)

ringcentral · Apr 21, 2022 · b5f3b2e · b5f3b2e
1 parent 49769de
commit b5f3b2e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/main.js b/main.js
@@ -8,7 +8,6 @@ const {
   shell,
   Menu,
   Tray,
-  globalShortcut,
 } = require('electron');
 const singleInstanceLock = app.requestSingleInstanceLock();
 
@@ -128,6 +127,14 @@ function createMainWindow() {
     }
     return { action: 'allow' };
   });
+  const onInputEvent = (event, input) => {
+    if ((input.control || input.meta) && input.key.toLowerCase() === 'q') {
+      console.log('Pressed Control/Command+Q')
+      app.quit();
+    }
+  };
+  mainWindow.webContents.on('before-input-event', onInputEvent);
+  mainView.webContents.on('before-input-event', onInputEvent);
   // open dev tool default
   if (process.env.DEBUG == 1) {
     mainView.webContents.openDevTools();
@@ -192,10 +199,6 @@ if (!singleInstanceLock) {
 	app.quit();
 } else {
   app.whenReady().then(() => {
-    globalShortcut.register('CommandOrControl+Q', () => {
-      app.quit();
-    });
-  }).then(() => {
     createMainWindow();
     process.argv.forEach((cmd) => {
       handleCustomizedSchemeUri(cmd);

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "ringcentral-embeddable-voice-app",
   "description": "A RingCentral phone desktop client, built with RingCentral Embeddable and Electron",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "main": "main.js",
   "license": "MIT",
   "author": {