Merge pull request #3223 from withspectrum/persist-window-state-desktop

Persist desktop app window state on reopen

Author: brianlovin

desktop/package.json

@@ -13,7 +13,8 @@
   "dependencies": {
     "electron-is-dev": "^0.3.0",
     "electron-log": "^2.2.14",
-    "electron-updater": "^2.21.4"
+    "electron-updater": "^2.21.4",
+    "electron-window-state": "^4.1.1"
   },
   "devDependencies": {
     "electron": "^1.8.4",

desktop/src/config.js

@@ -17,6 +17,8 @@ module.exports = {
     'https://github.com/withspectrum/spectrum/blob/alpha/LICENSE',
   GITHUB_URL_ISSUES: 'https://github.com/withspectrum/spectrum/issues',
 
+  WINDOW_DEFAULT_HEIGHT: 800,
+  WINDOW_DEFAULT_WIDTH: 1300,
   WINDOW_MIN_HEIGHT: 500,
   WINDOW_MIN_WIDTH: 770,
   WINDOW_BG_COLOR: '#F5F8FC',

desktop/src/main.js

@@ -1,5 +1,6 @@
 // @flow
 const electron = require('electron');
+const windowStateKeeper = require('electron-window-state');
 const { app, BrowserWindow } = electron;
 const isDev = require('electron-is-dev');
 
@@ -26,12 +27,19 @@ function createWindow() {
     }, FIFTEEN_MINUTES);
   }
 
-  const { width, height } = electron.screen.getPrimaryDisplay().workAreaSize;
+  let mainWindowState = windowStateKeeper({
+    defaultWidth: CONFIG.WINDOW_DEFAULT_WIDTH,
+    defaultHeight: CONFIG.WINDOW_DEFAULT_HEIGHT,
+  });
+
+  const { width, height, x, y } = mainWindowState;
 
   // Create the main browser window.
   mainWindow = new BrowserWindow({
     width,
     height,
+    x,
+    y,
     titleBarStyle: 'hiddenInset',
     minHeight: CONFIG.WINDOW_MIN_HEIGHT,
     minWidth: CONFIG.WINDOW_MIN_WIDTH,
@@ -62,9 +70,10 @@ function createWindow() {
 
   // if main window is ready to show, show up the main window
   mainWindow.once('ready-to-show', () => {
-    mainWindow && mainWindow.maximize();
     mainWindow && mainWindow.show();
   });
+
+  mainWindowState.manage(mainWindow);
 }
 
 // This method will be called when Electron has finished