Persist desktop app window state on reopen

Closes #3214

Author: mxstbr

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');
 
@@ -21,12 +22,19 @@ function createWindow() {
     checkForUpdates();
   }
 
-  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,
@@ -57,9 +65,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

desktop/yarn.lock

@@ -462,6 +462,10 @@ decamelize@^1.1.1, decamelize@^1.1.2:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
 
+deep-equal@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
+
 deep-extend@~0.4.0:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f"
@@ -673,6 +677,14 @@ electron-updater@^2.21.4:
     semver "^5.5.0"
     source-map-support "^0.5.4"
 
+electron-window-state@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/electron-window-state/-/electron-window-state-4.1.1.tgz#6b34fdc31b38514dfec8b7c8f7b5d4addb67632d"
+  dependencies:
+    deep-equal "^1.0.1"
+    jsonfile "^2.2.3"
+    mkdirp "^0.5.1"
+
 electron@^1.8.4:
   version "1.8.4"
   resolved "https://registry.yarnpkg.com/electron/-/electron-1.8.4.tgz#cca8d0e6889f238f55b414ad224f03e03b226a38"
@@ -1070,7 +1082,7 @@ json5@^0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
 
-jsonfile@^2.1.0:
+jsonfile@^2.1.0, jsonfile@^2.2.3:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
   optionalDependencies:
@@ -1221,6 +1233,12 @@ [email protected]:
   dependencies:
     minimist "0.0.8"
 
+mkdirp@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
+  dependencies:
+    minimist "0.0.8"
+
 [email protected]:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"