Merge branch 'main' into main

src/config.d.ts

@@ -6,6 +6,10 @@ declare type DesktopConfig = {
   hardwareAcceleration: boolean;
   discordRpc: boolean;
   windowState: {
+    x: number;
+    y: number;
+    width: number;
+    height: number;
     isMaximised: boolean;
   };
 };

src/native/autoLaunch.ts

@@ -8,16 +8,20 @@ export const autoLaunch = new AutoLaunch({
   name: "Stoat",
 });
 
-ipcMain.on("isAutostart?", () =>
-  autoLaunch
-    .isEnabled()
-    .then((enabled) => mainWindow.webContents.send("isAutostart", enabled)),
-);
-
-ipcMain.on("setAutostart", (_event, state: boolean) => {
-  if (state) {
-    autoLaunch.enable();
-  } else {
-    autoLaunch.disable();
-  }
+ipcMain.handle("getAutostart", async () => {
+  const enabled = await autoLaunch.isEnabled();
+  return enabled;
+});
+
+ipcMain.handle("setAutostart", async (_event, state: boolean) => {
+  if (state) {
+    await autoLaunch.enable();
+    console.log("Received new configuration autoStart: true");
+  } else {
+    await autoLaunch.disable();
+    console.log("Received new configuration autoStart: false");
+  }
+
+  const enabled = await autoLaunch.isEnabled();
+  return enabled;
 });

src/native/config.ts

@@ -28,18 +28,18 @@ const schema = {
   windowState: {
     type: "object",
     properties: {
-      // x: {
-      //   type: 'number'
-      // } as JSONSchema.Number,
-      // y: {
-      //   type: 'number'
-      // } as JSONSchema.Number,
-      // width: {
-      //   type: 'number'
-      // } as JSONSchema.Number,
-      // height: {
-      //   type: 'number'
-      // } as JSONSchema.Number,
+      x: {
+        type: 'number'
+      } as JSONSchema.Number,
+      y: {
+        type: 'number'
+      } as JSONSchema.Number,
+      width: {
+        type: 'number'
+      } as JSONSchema.Number,
+      height: {
+        type: 'number'
+      } as JSONSchema.Number,
       isMaximised: {
         type: "boolean",
       } as JSONSchema.Boolean,
@@ -57,6 +57,10 @@ const store = new Store({
     hardwareAcceleration: true,
     discordRpc: true,
     windowState: {
+      x: 0,
+      y: 0,
+      width: 0,
+      height: 0,
       isMaximised: false,
     },
   } as DesktopConfig,

src/native/window.ts

@@ -62,6 +62,16 @@ export function createMainWindow() {
     mainWindow.maximize();
   }
 
+  // restore last position if it was moved previously
+  if(config.windowState.x > 0 || config.windowState.y > 0) {
+    mainWindow.setPosition(config.windowState.x ?? 0, config.windowState.y ?? 0);
+  }
+
+  // restore last size if it was resized previously
+  if(config.windowState.width > 0 && config.windowState.height > 0) {
+    mainWindow.setSize(config.windowState.width ?? 1280, config.windowState.height ?? 720);
+  }
+
   // load the entrypoint
   mainWindow.loadURL(BUILD_URL.toString());
 
@@ -80,12 +90,18 @@ export function createMainWindow() {
   // keep track of window state
   function generateState() {
     config.windowState = {
+      x: mainWindow.getPosition()[0],
+      y: mainWindow.getPosition()[1],
+      width: mainWindow.getSize()[0],
+      height: mainWindow.getSize()[1],
       isMaximised: mainWindow.isMaximized(),
     };
   }
 
   mainWindow.on("maximize", generateState);
   mainWindow.on("unmaximize", generateState);
+  mainWindow.on("moved", generateState);
+  mainWindow.on("resized", generateState);
 
   // rebind zoom controls to be more sensible
   mainWindow.webContents.on("before-input-event", (event, input) => {

src/world/config.ts

@@ -8,10 +8,9 @@ contextBridge.exposeInMainWorld("desktopConfig", {
   get: () => config,
   set: (config: DesktopConfig) => ipcRenderer.send("config", config),
   getAutostart() {
-    ipcRenderer.send("isAutostart?");
-    return new Promise((resolve) => ipcRenderer.once("isAutostart", resolve));
+    return ipcRenderer.invoke("getAutostart") as Promise<boolean>;
   },
   setAutostart(value: boolean) {
-    ipcRenderer.send("setAutostart", value);
+    return ipcRenderer.invoke("setAutostart", value) as Promise<boolean>;
   },
 });