Fixed shortcuts dialog box multiple monitors issue

responsively-org · Jun 1, 2020 · 593c782 · 593c782
1 parent fbfb5e5
commit 593c782
Showing 1 changed file with 18 additions and 5 deletions.
diff --git a/desktop-app/app/menu.js b/desktop-app/app/menu.js
@@ -1,5 +1,13 @@
 // @flow
-import {app, dialog, Menu, shell, BrowserWindow, clipboard} from 'electron';
+import {
+  app,
+  dialog,
+  Menu,
+  shell,
+  BrowserWindow,
+  clipboard,
+  screen,
+} from 'electron';
 import * as os from 'os';
 import {pkg} from './utils/generalUtils';
 
@@ -52,28 +60,33 @@ export default class MenuBuilder {
       {
         label: 'Keyboard Shortcuts',
         click: () => {
+          const {getCursorScreenPoint, getDisplayNearestPoint} = screen;
+
           let win = new BrowserWindow({
             parent: BrowserWindow.getFocusedWindow(),
-            modal: true,
             frame: false,
-            height: 800,
             webPreferences: {
               devTools: false,
               nodeIntegration: true,
             },
           });
 
+          const currentScreen = getDisplayNearestPoint(getCursorScreenPoint());
+          win.setPosition(currentScreen.workArea.x, currentScreen.workArea.y);
+
+          win.center();
+
           win.loadURL(`file://${__dirname}/shortcuts.html`);
 
           win.once('ready-to-show', () => {
             win.show();
           });
 
           win.on('blur', () => {
-            win.close();
+            win.hide();
           });
 
-          win.on('close', () => {
+          win.on('closed', () => {
             win = null;
           });
         },