Allow to remove config and save windows only on request

src/main/events.ts

@@ -89,7 +89,7 @@ export default function loadEvents() {
     } else if (mode === 'merge') {
       const def = config[val as keyof typeof config] ?? {};
       const user = store.get(val);
-      event.returnValue = Object.assign(def, user);
+      event.returnValue = { ...def, ...user };
     } else {
       event.returnValue = undefined;
     }
@@ -100,6 +100,9 @@ export default function loadEvents() {
   ipcMain.handle('store:delete', async (event, key) => {
     store.delete(key);
   });
+  ipcMain.handle('store:clear', async () => {
+    store.clear();
+  });
   ipcMain.handle(
     'store:subscribe',
     async (event, property, channel: string) => {
@@ -145,7 +148,8 @@ export default function loadEvents() {
   ipcMain.handle(
     'dialog:show-message-box',
     async (event, options: MessageBoxOptions) => {
-      await dialog.showMessageBox(options);
+      const result = await dialog.showMessageBox(options);
+      return result;
     }
   );
   ipcMain.handle(

src/main/main.ts

@@ -46,7 +46,10 @@ if (isDebug) {
 }
 
 function saveWindows() {
-  return store.get('interface.saveWindows', true);
+  const save = store.get('interface.saveWindows', true);
+  const onlyOnRequest = store.get('interface.saveOnlyOnRequest', false);
+
+  return save && !onlyOnRequest;
 }
 
 const installExtensions = async () => {
@@ -101,14 +104,13 @@ export async function createWindow(windowName: WindowNames) {
   let windowParams: WindowParams =
     config.windows[windowName.startsWith('log') ? 'log' : windowName] ?? {};
 
-  if (saveWindows()) {
-    const savedWindowParams: WindowParams = store.get(`windows.${name}`) || {};
-    windowParams = Object.assign(windowParams, savedWindowParams);
-  }
-
+  const savedWindowParams: WindowParams = store.get(`windows.${name}`) || {};
+  windowParams = { ...windowParams, ...savedWindowParams };
+  console.log(name, windowParams);
   const newWindow = new BrowserWindow({
     show: false,
     icon: getAssetPath('icon.png'),
+    title: name,
     titleBarStyle: 'hidden',
     backgroundColor: nativeTheme.shouldUseDarkColors ? '#37393E' : '#FFFFFF',
     ...windowParams,
@@ -136,33 +138,50 @@ export async function createWindow(windowName: WindowNames) {
       newWindow.show();
     }
 
-    const openWindows: string[] = store.get('windows.openWindows', ['main']);
-    if (!openWindows.includes(name)) openWindows.push(name);
-    store.set('windows.openWindows', openWindows);
+    if (saveWindows()) {
+      const openWindows: string[] = store.get('windows.openWindows', ['main']);
+      if (!openWindows.includes(name)) openWindows.push(name);
+      store.set('windows.openWindows', openWindows);
+    }
 
     // Force devtools to not show up on start.
     // newWindow.webContents.closeDevTools();
+
+    // This won't show anything on the window itself, but that way we can
+    // generate a list of window name to BrowserWindow anywhere.
+    newWindow.setTitle(name);
   });
 
+  // newWindow.on('did-finish-load', () => {
+  //   newWindow.setTitle(name);
+  // });
+
   newWindow.on('resized', () => {
+    if (!saveWindows()) return;
+
     const size = newWindow.getSize();
     store.set(`windows.${name}.width`, size[0]);
     store.set(`windows.${name}.height`, size[1]);
   });
 
   newWindow.on('moved', () => {
+    if (!saveWindows()) return;
+
     const position = newWindow.getPosition();
     store.set(`windows.${name}.x`, position[0]);
     store.set(`windows.${name}.y`, position[1]);
   });
 
   newWindow.on('closed', () => {
     windows.delete(name);
-    const openWindows: string[] = store.get('windows.openWindows', []);
-    const newOpenWindows = openWindows.filter((value) => {
-      return value === 'main' || value !== name;
-    });
-    setTimeout(() => store.set('windows.openWindows', newOpenWindows), 3000);
+
+    if (saveWindows()) {
+      const openWindows: string[] = store.get('windows.openWindows', []);
+      const newOpenWindows = openWindows.filter((value) => {
+        return value === 'main' || value !== name;
+      });
+      setTimeout(() => store.set('windows.openWindows', newOpenWindows), 3000);
+    }
   });
 
   if (name === 'main') {
@@ -199,11 +218,9 @@ app.on('window-all-closed', () => {
 app
   .whenReady()
   .then(() => {
-    let openWindows: WindowNames[] = ['main'];
-    if (saveWindows()) {
-      openWindows = store.get('windows.openWindows', ['main']);
-    }
-
+    const openWindows: WindowNames[] = store.get('windows.openWindows', [
+      'main',
+    ]);
     openWindows.map((key) => createWindow(key));
 
     app.on('activate', () => {

src/main/menu.ts

@@ -8,6 +8,7 @@ import {
   shell,
 } from 'electron';
 import { createWindow } from './main';
+import { saveWindows } from './util';
 
 interface DarwinMenuItemConstructorOptions extends MenuItemConstructorOptions {
   selector?: string;
@@ -70,6 +71,11 @@ export default class MenuBuilder {
           click: () => createWindow('preferences'),
         },
         { type: 'separator' },
+        {
+          label: 'Save window positions',
+          click: saveWindows,
+        },
+        { type: 'separator' },
         { label: 'Services', submenu: [] },
         { type: 'separator' },
         {

src/main/preload.ts

@@ -12,6 +12,7 @@ import {
   ipcRenderer,
   IpcRendererEvent,
   MessageBoxOptions,
+  MessageBoxReturnValue,
   shell,
 } from 'electron';
 import Command from './tron/command';
@@ -122,6 +123,9 @@ const ElectronAPI = {
     delete(key: string) {
       return ipcRenderer.invoke('store:delete', key);
     },
+    clear() {
+      return ipcRenderer.invoke('store:clear');
+    },
     subscribe(property: string, channel: string) {
       return ipcRenderer.invoke('store:subscribe', property, channel);
     },
@@ -149,9 +153,11 @@ const ElectronAPI = {
     },
   },
   dialog: {
-    showMessageBox: async (options: MessageBoxOptions) =>
+    showMessageBox: async (
+      options: MessageBoxOptions
+    ): Promise<MessageBoxReturnValue> =>
       ipcRenderer.invoke('dialog:show-message-box', options),
-    showErrorBox: async (title: string, content: string) =>
+    showErrorBox: async (title: string, content: string): Promise<void> =>
       ipcRenderer.invoke('dialog:show-error-box', title, content),
   },
 };

src/main/store/user.json

@@ -15,7 +15,8 @@
   },
   "interface": {
     "mode": "system",
-    "saveWindows": true
+    "saveWindows": true,
+    "saveOnlyOnRequest": false
   },
   "guider": {
     "xpaset": "/usr/local/bin/xpaset",

src/main/util.ts

@@ -1,6 +1,9 @@
 /* eslint import/prefer-default-export: off */
+import { BrowserWindow } from 'electron';
 import path from 'path';
 import { URL } from 'url';
+import store from './store';
+import { WindowParams } from './types';
 
 export function resolveHtmlPath(htmlFileName: string) {
   if (process.env.NODE_ENV === 'development') {
@@ -23,6 +26,34 @@ function getRandomInt(min: number, max: number) {
   return Math.floor(Math.random() * (max - min)) + min;
 }
 
+export function saveWindows() {
+  const openWindows = BrowserWindow.getAllWindows();
+
+  const windows: { [key: string]: WindowParams } = {};
+
+  openWindows.forEach((win) => {
+    const name = win.getTitle();
+
+    const size = win.getSize();
+    const position = win.getPosition();
+
+    windows[name] = {
+      x: position[0],
+      y: position[1],
+      width: size[0],
+      height: size[1],
+    };
+  });
+
+  store.set('windows', windows);
+
+  const openWindowsNames = openWindows.map((win) => win.getTitle());
+  if (!openWindowsNames.includes('main')) {
+    openWindowsNames.push('main');
+  }
+  store.set('windows.openWindows', openWindowsNames);
+}
+
 export function generateName() {
   const name1 = [
     'abandoned',

src/renderer/App.tsx

@@ -36,6 +36,11 @@ export default function App() {
         action: {
           boxBackground: prefersDarkMode ? '#40444B' : '#EBEDEF',
         },
+        error: {
+          dark: '#d32f2f',
+          light: '#e57373',
+          main: '#CC4B41',
+        },
       },
       typography: {
         fontSize: 12,

src/renderer/Components/IOSwitch.tsx

@@ -47,6 +47,9 @@ const IOSSwitch = styled((props: SwitchProps) => (
         opacity: 1,
         border: 0,
       },
+      '&.Mui-disabled + .MuiSwitch-track': {
+        opacity: 0.5,
+      },
       '&:hover': {
         backgroundColor: theme.palette.mode === 'light' && 'white',
       },
@@ -55,6 +58,15 @@ const IOSSwitch = styled((props: SwitchProps) => (
       backgroundColor: theme.palette.action.active,
     },
   },
+  '&.Mui-disabled .MuiSwitch-thumb': {
+    color:
+      theme.palette.mode === 'light'
+        ? theme.palette.grey[100]
+        : theme.palette.grey[600],
+  },
+  '&.Mui-disabled + .MuiSwitch-track': {
+    opacity: theme.palette.mode === 'light' ? 0.7 : 0.3,
+  },
   '& .MuiSwitch-track': {
     borderRadius: 26 / 2,
     backgroundColor: theme.palette.action.disabledBackground,

src/renderer/Preferences/Components/Switch.tsx

@@ -13,10 +13,11 @@ import { useStore } from 'renderer/hooks';
 
 export interface SwitchProps {
   param: string;
+  disabled?: boolean;
 }
 
 export default function Switch(props: SwitchProps) {
-  const { param } = props;
+  const { param, disabled = false } = props;
 
   const [value, setValue] = useStore<boolean>(param);
 
@@ -27,5 +28,7 @@ export default function Switch(props: SwitchProps) {
     setValue(checked);
   };
 
-  return <IOSSwitch checked={value} onChange={handleChange} />;
+  return (
+    <IOSSwitch disabled={disabled} checked={value} onChange={handleChange} />
+  );
 }