From e59c2aa0eb5843c2ab7f3823a2e7a4e827443bce Mon Sep 17 00:00:00 2001
From: Dean Campbell <thedeancampbell@gmail.com>
Date: Wed, 7 Oct 2020 23:43:33 -0700
Subject: [PATCH] Updates for saving state on macOS and multi-mon

---
 wowup-electron/main.ts                        | 36 ++++++++++++++-----
 .../src/app/models/wowup/window-state.ts      | 11 +++---
 wowup-electron/src/app/utils/number.utils.ts  |  7 ++++
 3 files changed, 41 insertions(+), 13 deletions(-)
 create mode 100644 wowup-electron/src/app/utils/number.utils.ts

diff --git a/wowup-electron/main.ts b/wowup-electron/main.ts
index c9941f65..bb90d5d6 100644
--- a/wowup-electron/main.ts
+++ b/wowup-electron/main.ts
@@ -24,6 +24,9 @@ import * as log from 'electron-log';
 import { autoUpdater } from "electron-updater"
 import * as Store from 'electron-store'
 import { WindowState } from './src/app/models/wowup/window-state';
+import { isBetween } from './src/app/utils/number.utils';
+import { Subject } from 'rxjs';
+import { debounceTime } from 'rxjs/operators';
 
 const isMac = process.platform === 'darwin';
 const isWin = process.platform === 'win32';
@@ -131,8 +134,9 @@ function createTray() {
 }
 
 function windowStateManager(windowName: string, { width, height }: { width: number, height: number }) {
-  let window: BrowserWindow; // Hold a reference to the window
+  let window: BrowserWindow;
   let windowState: WindowState;
+  const saveState$ = new Subject<void>();
 
   function setState() {
     let setDefaults = false;
@@ -144,11 +148,14 @@ function windowStateManager(windowName: string, { width, height }: { width: numb
       log.info('found window state:', windowState);
       const displays = screen.getAllDisplays();
       const maxDisplay = displays.reduce((prev, current) => prev.bounds.x > current.bounds.x ? prev : current);
+      const minDisplay = displays.reduce((prev, current) => prev.bounds.x < current.bounds.x ? prev : current);
 
+      log.info('min display:', minDisplay);
       log.info('max display:', maxDisplay);
 
-      if (windowState.x > maxDisplay.bounds.width || windowState.y > maxDisplay.bounds.height) {
-        log.info('reset window state, bounds are too big');
+      if (!isBetween(windowState.x, minDisplay.bounds.x, maxDisplay.bounds.width, true) ||
+        !isBetween(windowState.y, minDisplay.bounds.y, maxDisplay.bounds.height, true)) {
+        log.info('reset window state, bounds are outside displays');
         setDefaults = true;
       }
     }
@@ -158,22 +165,30 @@ function windowStateManager(windowName: string, { width, height }: { width: numb
       windowState = <WindowState>{ width, height };
     }
   }
-  
+
   function saveState() {
-    if (!window.isMaximized()) {
+    log.info('saving window state');
+    if (!window.isMaximized() && !window.isFullScreen()) {
       windowState = { ...windowState, ...window.getBounds() };
     }
     windowState.isMaximized = window.isMaximized();
+    windowState.isFullScreen = window.isFullScreen();
     preferenceStore.set(`${windowName}-window-state`, windowState);
   }
 
   function monitorState(win: BrowserWindow) {
     window = win;
 
-    win.on('resize', saveState);
     win.on('close', saveState);
+    win.on('resize', () => saveState$.next());
+    win.on('move', () => saveState$.next());
+    win.on('closed', () => saveState$.unsubscribe());
   }
 
+  saveState$
+    .pipe(debounceTime(500))
+    .subscribe(() => saveState());
+
   setState();
 
   return({
@@ -183,6 +198,8 @@ function windowStateManager(windowName: string, { width, height }: { width: numb
 }
 
 function createWindow(): BrowserWindow {
+  // Main object for managing window state
+  // Initialize with a window name and default size
   const mainWindowManager = windowStateManager('main', { width: 900, height: 600 });
 
   const windowOptions: BrowserWindowConstructorOptions = {
@@ -212,6 +229,7 @@ function createWindow(): BrowserWindow {
   // Create the browser window.
   win = new BrowserWindow(windowOptions);
 
+  // Keep track of window state
   mainWindowManager.monitorState(win);
 
   win.webContents.userAgent = USER_AGENT;
@@ -224,8 +242,10 @@ function createWindow(): BrowserWindow {
       })
   });
 
-  win.on('show', () => {
-    if (mainWindowManager.isMaximized) {
+  win.once('show', () => {
+    if (mainWindowManager.isFullScreen) {
+      win.setFullScreen(true);
+    } else if (mainWindowManager.isMaximized) {
       win.maximize();
     }
   })
diff --git a/wowup-electron/src/app/models/wowup/window-state.ts b/wowup-electron/src/app/models/wowup/window-state.ts
index 60effaac..8b866181 100644
--- a/wowup-electron/src/app/models/wowup/window-state.ts
+++ b/wowup-electron/src/app/models/wowup/window-state.ts
@@ -1,7 +1,8 @@
 export interface WindowState {
-    x: number;
-    y: number;
-    width: number;
-    height: number;
-    isMaximized: boolean;
+  x: number;
+  y: number;
+  width: number;
+  height: number;
+  isMaximized: boolean;
+  isFullScreen: boolean;
 }
\ No newline at end of file
diff --git a/wowup-electron/src/app/utils/number.utils.ts b/wowup-electron/src/app/utils/number.utils.ts
new file mode 100644
index 00000000..9a73ed27
--- /dev/null
+++ b/wowup-electron/src/app/utils/number.utils.ts
@@ -0,0 +1,7 @@
+export function isBetween(val: number, min: number, max: number, inclusive: boolean = false) {
+  if (inclusive) {
+    return val >= min && val <= max;
+  } else {
+    return val > min && val < max;
+  }
+}
\ No newline at end of file