From b71e09284ee541aa1fd7851fe82a0315ecd62bbd Mon Sep 17 00:00:00 2001
From: Jordan Eldredge <jordan@jordaneldredge.com>
Date: Wed, 19 Sep 2018 21:43:55 -0700
Subject: [PATCH] Serialize window position as well

---
 js/reducers/windows.ts | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/js/reducers/windows.ts b/js/reducers/windows.ts
index 6ca1902d..096ba0a0 100644
--- a/js/reducers/windows.ts
+++ b/js/reducers/windows.ts
@@ -28,6 +28,7 @@ interface SerializedWindow {
 
 export interface WindowsSerializedStateV1 {
   genWindows: { [windowId: string]: SerializedWindow };
+  positions: WindowPositions;
 }
 
 const defaultWindowsState: WindowsState = {
@@ -176,15 +177,25 @@ const windows = (
         positions: { ...state.positions, ...action.positions }
       };
     case LOAD_SERIALIZED_STATE: {
-      const serializedWindow = action.serializedState.windows.genWindows;
+      const {
+        genWindows: serializedWindows,
+        positions: serializedPositions
+      } = action.serializedState.windows;
       return {
         ...state,
         genWindows: objectMap(state.genWindows, (w, windowId) => {
-          const serializedW = serializedWindow[windowId];
+          const serializedW = serializedWindows[windowId];
           if (serializedW == null || w.generic) {
             return w;
           }
           return { ...w, ...serializedW };
+        }),
+        positions: objectMap(state.positions, (position, windowId) => {
+          const serializedPosition = serializedPositions[windowId];
+          if (serializedPosition == null) {
+            return position;
+          }
+          return serializedPosition;
         })
       };
     }
@@ -205,7 +216,8 @@ export function getSerializedState(
         hidden: w.hidden,
         shade: w.shade || false
       };
-    })
+    }),
+    positions: state.positions
   };
 }