fix: registering shortcuts

Closes #75
sentialx · Dec 10, 2019 · 8da0a03 · 8da0a03
1 parent 382cde1
commit 8da0a03
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 21 deletions.
diff --git a/src/main/container.ts b/src/main/container.ts
@@ -35,8 +35,8 @@ export class Container {
   public constructor(appWindow: AppWindow, window: ProcessWindow) {
     this.appWindow = appWindow;
 
-    let colId = spaceId++;
-    let rowId = spaceId++;
+    const colId = spaceId++;
+    const rowId = spaceId++;
 
     this.columns.push({
       id: colId,
@@ -190,7 +190,7 @@ export class Container {
         x < col.x ||
         y < area.y ||
         y > area.y + area.height ||
-        ((row && y > row.y + row.height) || y < row.y)
+        (row && y > row.y + row.height) || y < row.y
       ) {
         this.removeWindow(win.id);
       }

diff --git a/src/main/index.ts b/src/main/index.ts
@@ -1,4 +1,4 @@
-import { ipcMain, app, Menu, BrowserWindow, webContents } from 'electron';
+import { ipcMain, app, Menu, webContents } from 'electron';
 import { resolve } from 'path';
 import { platform, homedir } from 'os';
 import { AppWindow } from './windows/app';
@@ -9,7 +9,7 @@ ipcMain.setMaxListeners(0);
 
 app.setPath('userData', resolve(homedir(), '.multrin'));
 
-export let appWindows: AppWindow[] = [];
+export const appWindows: AppWindow[] = [];
 
 const gotTheLock = app.requestSingleInstanceLock();
 

diff --git a/src/main/windows/app.ts b/src/main/windows/app.ts
@@ -151,19 +151,9 @@ export class AppWindow extends BrowserWindow {
       this.setIcon(nativeImage.createFromPath(dialogRes.filePaths[0]));
     });
 
-    if (platform() !== 'darwin') {
-      globalShortcut.register('Ctrl+Tab', () => {
-        const { id } = windowManager.getActiveWindow();
-        if (
-          this.isFocused() ||
-          this.containers.find(x => x.windows.find(y => y.id === id))
-        ) {
-          this.webContents.send('next-tab');
-        }
-      });
-    }
-
     windowManager.on('window-activated', (window: Window) => {
+      this.registerShortcut(window.id);
+
       if (!this.isFocused()) return;
 
       for (const container of this.containers) {
@@ -331,6 +321,8 @@ export class AppWindow extends BrowserWindow {
           setTimeout(() => {
             this.selectContainer(container);
           }, 50);
+
+          this.registerShortcut(win.id);
         } else if (this.willSplitWindow) {
           this.willSplitWindow = false;
 
@@ -345,6 +337,21 @@ export class AppWindow extends BrowserWindow {
     });
   }
 
+  private registerShortcut(id: number) {
+    if (
+      this.containers.find(x => x.windows.find(y => y.id === id)) ||
+      this.isFocused()
+    ) {
+      if (!globalShortcut.isRegistered('CmdOrCtrl+Tab')) {
+        globalShortcut.register('CmdOrCtrl+Tab', () => {
+          this.webContents.send('next-tab');
+        });
+      }
+    } else if (globalShortcut.isRegistered('CmdOrCtrl+Tab')) {
+      globalShortcut.unregister('CmdOrCtrl+Tab');
+    }
+  }
+
   private intervalCallback = () => {
     if (!this.isMinimized()) {
       for (const container of this.containers) {

diff --git a/webpack.config.base.js b/webpack.config.base.js
@@ -78,10 +78,7 @@ const config = {
     },
   },
 
-  externals: getExternals([
-    'iohook',
-    'node-vibrant',
-  ]),
+  externals: getExternals(['iohook', 'node-vibrant']),
 };
 
 if (dev) {