make appearance configurable

HoldemPokerTools · Oct 19, 2020 · be81f09 · be81f09
1 parent 95b7783
commit be81f09
Show file tree

Hide file tree

Showing 3 changed files with 139 additions and 91 deletions.
diff --git a/packages/desktop/public/electron.js b/packages/desktop/public/electron.js
@@ -17,42 +17,35 @@ const BUILDER_URL = isDev ? DEV_URL : PROD_URL;
 
 const readFile = util.promisify(fs.readFile);
 
-let appWindows = [];
+let appWindow;
+let initOpenFileQueue = [];
 let primaryDisplay;
 let dialogShown = false;
-
-const commonWindowOptions = {
-  resizable: false,
-  transparent: false,
-  hasShadow: true,
-  backgroundColor: "#ffffff",
-  fullscreenable: false,
-  alwaysOnTop: true,
-  maximizable: false,
-  minimizable: true,
-  title: "Range Assistant",
-  webPreferences: {
-    devTools: isDev,
-    nodeIntegration: false,
-    nodeIntegrationInWorker: false,
-    enableRemoteModule: false,
-    contextIsolation: true,
-    preload: path.join(__dirname, "preload.js"),
-  },
+// Default settings
+let settings = {
+  alwaysOnTop: false,
+  fadeOnBlur: false,
 };
 
-app.on('will-finish-launching', () => {
-  app.on("open-file", (event, fp) => {
-    handleRange(fp);
-  });
-  ipcMain.on("open-file", (event, fp) => {
-    handleRange(fp);
-  })
-});
-
-function createAppWindow() {
+const createAppWindow = async () => {
   let win = new BrowserWindow({
-    ...commonWindowOptions,
+    resizable: false,
+    transparent: false,
+    hasShadow: true,
+    backgroundColor: "#ffffff",
+    fullscreenable: false,
+    alwaysOnTop: settings.alwaysOnTop,
+    maximizable: false,
+    minimizable: true,
+    title: "Range Assistant",
+    webPreferences: {
+      devTools: isDev,
+      nodeIntegration: false,
+      nodeIntegrationInWorker: false,
+      enableRemoteModule: false,
+      contextIsolation: true,
+      preload: path.join(__dirname, "preload.js"),
+    },
     width,
     height,
     minWidth: width,
@@ -63,18 +56,23 @@ function createAppWindow() {
   } else {
     win.loadFile(path.join(__dirname, "../build/index.html"));
   }
-  appWindows.push(win);
-  const idx = appWindows.length - 1;
+  appWindow = win;
 
   win.on("closed", () => {
-    win = null;
-    appWindows.splice(idx, 1);
+    appWindow = null;
   });
   // see https://github.com/electron/electron/issues/20618 and https://github.com/electron/electron/issues/1336
   // win.setAspectRatio(1, {width: 0, height: 74});
 
   win.webContents.on("new-window", handleNavigate);
   win.webContents.on("will-navigate", handleNavigate);
+  win.webContents.on('did-finish-load', () => {
+    if (initOpenFileQueue.length) {
+      const fps = initOpenFileQueue = [...initOpenFileQueue];
+      initOpenFileQueue = [];
+      fps.forEach((fp) => handleRange(fp));
+    }
+  });
   if (isDev) {
     win.webContents.openDevTools({ mode: "detach" });
   }
@@ -91,9 +89,7 @@ const handleRange = (fp) => {
     .then(data => {
       const range = JSON.parse(data);
       validateRange(range);
-      appWindows.forEach((win) => {
-        win.webContents.send("add-range", range)
-      });
+      appWindow && appWindow.webContents.send("add-range", range);
     })
     .catch(err => {
       console.debug(err);
@@ -125,71 +121,111 @@ const showOpenFileDialog = async () => {
   }
 };
 
-const resetWindowPositions = () => {
-  appWindows.forEach((win) => win.setPosition(0, 0));
+const resetWindowPosition = () => {
+  appWindow && appWindow.setPosition(0, 0);
 };
 
+const handleSettingsChange = (updated) => {
+  Object.assign(settings, updated);
+  appWindow && appWindow.setAlwaysOnTop(settings.alwaysOnTop);
+}
+
 const setMenu = () => {
   const menu = defaultMenu(
     app,
     shell,
     showOpenFileDialog,
-    createAppWindow
+    settings,
+    handleSettingsChange
   );
   Menu.setApplicationMenu(Menu.buildFromTemplate(menu));
 };
 
-app.on("ready", () => {
-  // handle display changes
-  const handleWindowChange = () => {
-    const newPrimary = screen.getPrimaryDisplay();
-    if (newPrimary.id !== primaryDisplay.id) {
-      primaryDisplay = newPrimary;
-      resetWindowPositions();
-    }
-  };
-  screen.on("display-added", handleWindowChange);
-  screen.on("display-removed", handleWindowChange);
-  primaryDisplay = screen.getPrimaryDisplay();
-  setMenu();
-  createAppWindow();
-  autoUpdater.checkForUpdatesAndNotify();
-});
-
-app.on("window-all-closed", () => {
-  app.quit();
-});
-
-app.on("activate", () => {
-  if (appWindows.length === 0) {
-    createAppWindow();
-  }
-});
-
-app.on("browser-window-focus", () => {
-  appWindows.forEach((win) => win.setOpacity(1));
-});
-
-app.on("browser-window-blur", () => {
-  appWindows.forEach((win) => win.setOpacity(0.3));
-});
-
 const handleNavigate = (event, url) => {
   if (!isDev || url.startsWith(PROD_URL)) event.preventDefault();
   if (url.startsWith(PROD_URL)) {
     shell.openExternal(BUILDER_URL);
   }
 };
 
-app.on("web-contents-created", (event, contents) => {
-  contents.on("will-attach-webview", (event, webPreferences, params) => {
-    // Strip away preload scripts if unused or verify their location is legitimate
-    if (webPreferences !== commonWindowOptions.webPreferences) {
+const hasValidExtension = fp => fp.endsWith(".range") || fp.endsWith(".json");
+
+if (!app.requestSingleInstanceLock()) {
+  app.quit()
+} else {
+  app.on('second-instance', (event, argv, workingDirectory) => {
+    // Someone tried to run a second instance, we should focus our window and load any ranges that triggered the app.
+    if (appWindow) {
+      if (appWindow.isMinimized()) appWindow.restore();
+      appWindow.focus();
+      let args = argv.slice(isDev ? 2 : 1);
+      let files = args.filter(el => {
+        return el.substring(0, 2) !== '--' && hasValidExtension(fp) && fs.existsSync(el);
+      });
+      !isMac && files.forEach(handleRange);
+    }
+  });
+
+  app.on('will-finish-launching', () => {
+    app.on("open-file", (event, fp) => {
       event.preventDefault();
-      return;
+      if (app.isReady() === false) {
+        initOpenFileQueue.push(fp);
+      } else {
+        handleRange(fp);
+      };
+    });
+    ipcMain.on("open-file", (event, fp) => {
+      handleRange(fp);
+    });
+  });
+
+  app.on("ready", () => {
+    // handle display changes
+    const handleWindowChange = () => {
+      const newPrimary = screen.getPrimaryDisplay();
+      if (newPrimary.id !== primaryDisplay.id) {
+        primaryDisplay = newPrimary;
+        resetWindowPosition();
+      }
+    };
+    screen.on("display-added", handleWindowChange);
+    screen.on("display-removed", handleWindowChange);
+    primaryDisplay = screen.getPrimaryDisplay();
+    setMenu();
+    createAppWindow();
+    autoUpdater.checkForUpdatesAndNotify();
+  });
+
+  app.on("window-all-closed", () => {
+    app.quit();
+  });
+
+  app.on("activate", () => {
+    if (!appWindow) {
+      createAppWindow();
     }
   });
-});
+
+  app.on("browser-window-focus", () => {
+    appWindow && appWindow.setOpacity(1);
+  });
+
+  app.on("browser-window-blur", () => {
+    appWindow && appWindow.setOpacity(settings.fadeOnBlur ? 0.3 : 1);
+  });
+
+  app.on("web-contents-created", (event, contents) => {
+    contents.on("will-attach-webview", (event, webPreferences, params) => {
+      // Strip away preload scripts if unused or verify their location is legitimate
+      if (webPreferences !== commonWindowOptions.webPreferences) {
+        event.preventDefault();
+        return;
+      }
+    });
+  });
+
+}
 
 if (isDev) {
   require("electron-reload")(__dirname, {

diff --git a/packages/desktop/public/menu.js b/packages/desktop/public/menu.js
@@ -1,6 +1,6 @@
 const isMac = process.platform === "darwin";
 
-module.exports = (app, shell, onOpen, createAppWindow) => [
+module.exports = (app, shell, onOpen, settings, onSettingsChange) => [
   ...(isMac
     ? [
         {
@@ -22,17 +22,12 @@ module.exports = (app, shell, onOpen, createAppWindow) => [
   {
     label: "File",
     submenu: [
-      {
-        label: "New Window",
-        click: createAppWindow,
-        accelerator: "CmdOrCtrl+N",
-      },
-      { type: "separator" },
       {
         label: "Import Range",
         click: onOpen,
         accelerator: "CmdOrCtrl+I",
       },
+      { type: "separator" },
       isMac ? { role: "close" } : { role: "quit" },
     ],
   },
@@ -55,6 +50,23 @@ module.exports = (app, shell, onOpen, createAppWindow) => [
         : [{ role: "delete" }, { type: "separator" }, { role: "selectAll" }]),
     ],
   },
+  {
+    label: "Appearance",
+    submenu: [
+      {
+        label: "Always on Top",
+        type: "checkbox",
+        checked: settings.alwaysOnTop,
+        click: (e) => onSettingsChange({...settings, alwaysOnTop: e.checked})
+      },
+      {
+        label: "Fade When Inactive",
+        type: "checkbox",
+        checked: settings.fadeOnBlur,
+        click: (e) => onSettingsChange({...settings, fadeOnBlur: e.checked})
+      },
+    ]
+  },
   {
     role: "help",
     submenu: [

diff --git a/packages/desktop/public/preload.js b/packages/desktop/public/preload.js
@@ -1,5 +1,5 @@
 const { contextBridge, ipcRenderer } = require("electron");
-
+const hasValidExtension = fp => fp.endsWith(".range") || fp.endsWith(".json");
 contextBridge.exposeInMainWorld("Ranges", {
   isMac: process.platform === "darwin",
   onAdd: (handler) => {
@@ -8,7 +8,7 @@ contextBridge.exposeInMainWorld("Ranges", {
     ipcRenderer.on("add-range", newCallback);
   },
   importRangeFile: (fp) => {
-    if (fp && fp.endsWith(".range")) {
+    if (fp && hasValidExtension(fp)) {
       ipcRenderer.send('open-file', fp)
     }
   }