Merge pull request #4482 from bsclifton/window-size-position

Save the window size (width, height) and use it when restoring from s…

docs/state.md

@@ -341,7 +341,8 @@ WindowStore
   closedFrames: [], // holds the same type of frame objects as above
   ui: {
     isMaximized: boolean, // true if window is maximized
-    position: array, // last known window position
+    position: array, // last known window position [x, y]
+    size: array, // last known window size [x, y]
     isFullScreen: boolean, // true if window is fullscreen
     mouseInTitlebar: boolean, //Whether or not the mouse is in the titlebar
     dragging: {

docs/windowActions.md

@@ -611,6 +611,16 @@ Saves the position of the window in the window state
 
 
 
+### saveSize(size) 
+
+Saves the size (width, height) of the window in the window state
+
+**Parameters**
+
+**size**: `Array`, [x, y]
+
+
+
 ### setWindowFullScreen(isFullScreen) 
 
 Sets the fullscreen state of the window

js/actions/windowActions.js

@@ -807,6 +807,17 @@ const windowActions = {
     })
   },
 
+  /**
+   * Saves the size (width, height) of the window in the window state
+   * @param {Array} size - [x, y]
+   */
+  saveSize: function (size) {
+    dispatch({
+      actionType: WindowConstants.WINDOW_SAVE_SIZE,
+      size
+    })
+  },
+
   /**
    * Sets the fullscreen state of the window
    * @param {boolean} isFullScreen - true if window is fullscreen

js/components/main.js

@@ -484,6 +484,7 @@ class Main extends ImmutableComponent {
     }
 
     // Handlers for saving window state
+    // TODO: revisit this code when window state moves to appStore
     currentWindow.on('maximize', function () {
       windowActions.setMaximizeState(true)
     })
@@ -492,6 +493,10 @@ class Main extends ImmutableComponent {
       windowActions.setMaximizeState(false)
     })
 
+    currentWindow.on('resize', function (event) {
+      windowActions.saveSize(event.sender.getSize())
+    })
+
     let moveTimeout = null
     currentWindow.on('move', function (event) {
       if (moveTimeout) {

js/constants/windowConstants.js

@@ -50,6 +50,7 @@ const windowConstants = {
   WINDOW_SET_FAVICON: _,
   WINDOW_SET_MAXIMIZE_STATE: _,
   WINDOW_SAVE_POSITION: _,
+  WINDOW_SAVE_SIZE: _,
   WINDOW_SET_FULLSCREEN_STATE: _,
   WINDOW_SET_MOUSE_IN_TITLEBAR: _,
   WINDOW_SET_FINDBAR_SHOWN: _, // whether the findbar is shown

js/stores/appStore.js

@@ -58,6 +58,11 @@ function navbarHeight () {
 const createWindow = (browserOpts, defaults, frameOpts, windowState) => {
   const parentWindowKey = browserOpts.parentWindowKey
 
+  if (windowState.ui && windowState.ui.size) {
+    browserOpts.width = firstDefinedValue(browserOpts.width, windowState.ui.size[0])
+    browserOpts.height = firstDefinedValue(browserOpts.height, windowState.ui.size[1])
+  }
+
   browserOpts.width = firstDefinedValue(browserOpts.width, browserOpts.innerWidth, defaults.width)
   // height and innerHeight are the frame webview size
   browserOpts.height = firstDefinedValue(browserOpts.height, browserOpts.innerHeight)

js/stores/windowStore.js

@@ -671,6 +671,9 @@ const doAction = (action) => {
     case WindowConstants.WINDOW_SAVE_POSITION:
       windowState = windowState.setIn(['ui', 'position'], action.position)
       break
+    case WindowConstants.WINDOW_SAVE_SIZE:
+      windowState = windowState.setIn(['ui', 'size'], action.size)
+      break
     case WindowConstants.WINDOW_SET_FULLSCREEN_STATE:
       windowState = windowState.setIn(['ui', 'isFullScreen'], action.isFullScreen)
       break