[Feat] Window positions are now retained on launch

Author: Denoder

README.md

@@ -73,7 +73,8 @@ A DPS meter for Blue Protocol built with Electron, React 19, and TypeScript. Thi
 | Command | Description |
 |---------|-------------|
 | `npm run dev` | Start development mode with hot reload |
-| `npm run dev:windows` | Start development with hot reload - and utf8 output |
+| `npm run dev:win` | Start development with hot reload - and utf8 output |
+' `npm run electron:rebuild:win` | Build/Rebuild electron with the cap module |
 | `npm run build` | Build renderer and main process |
 | `npm run build:server` | Build standalone server |
 | `npm run build:all` | Build everything |

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "bpsr-meter",
-    "version": "0.4.8",
+    "version": "0.4.9",
     "description": "BPSR Meter",
     "author": "Denoder",
     "type": "module",

package.json

@@ -58,8 +58,16 @@ export const keybindSettings = [
     "dataResetKeybind",
 ];
 
-export type WindowType = keyof typeof WINDOW_CONFIGS;
+export type WindowType =
+    | "main"
+    | "group"
+    | "history"
+    | "device"
+    | "settings"
+    | "monsters"
+    | "update";
 export type WindowSize = { width: number; height: number; scale?: number };
+export type WindowPosition = { x: number; y: number };
 
 export const globalSettings: GlobalSettings = {
     availableLanguages: ["en", "zh"],

src/main/constants.ts

@@ -14,7 +14,12 @@ import {
 import { electronApp, is } from "@electron-toolkit/utils";
 import fs from "fs";
 import path from "path";
-import { CONSTANTS, WindowType, keybindSettings } from "./constants";
+import {
+    CONSTANTS,
+    WindowType,
+    WindowSize,
+    keybindSettings,
+} from "./constants";
 import type { GlobalSettings } from "../types";
 import { SettingsManager } from "./managers/settings-manager";
 import { Logger } from "./logger";
@@ -245,7 +250,30 @@ class Application {
             },
         );
 
-        ipcMain.handle("get-saved-window-sizes", async () => {
+        ipcMain.on(
+            "save-window-position",
+            async (
+                _event: IpcMainEvent,
+                windowType: WindowType,
+                x: number,
+                y: number,
+            ) => {
+                try {
+                    await this.#windowManager.saveWindowPosition(
+                        windowType,
+                        x,
+                        y,
+                    );
+                } catch (err) {
+                    this.#logger.error(
+                        `Error saving window position for ${windowType}`,
+                        err,
+                    );
+                }
+            },
+        );
+
+        ipcMain.handle("get-saved-window-size", async () => {
             return await this.#settingsManager.getWindowSizes(
                 this.#windowManager.lastWindowSizes,
             );

src/main/index.ts

@@ -1,5 +1,5 @@
 import fs from "fs/promises";
-import { WindowType, WindowSize } from "../constants";
+import { WindowType, WindowSize, WindowPosition } from "../constants";
 import type { GlobalSettings } from "../../types";
 
 export class SettingsManager {
@@ -42,6 +42,29 @@ export class SettingsManager {
         return defaultSizes;
     }
 
+    async getWindowPositions(
+        defaultPositions: Record<WindowType, WindowPosition>,
+    ): Promise<Record<WindowType, WindowPosition>> {
+        try {
+            const settings = await this.getSettings();
+            if (settings.windowPositions) {
+                Object.entries(settings.windowPositions).forEach(
+                    ([type, pos]) => {
+                        if (type in defaultPositions) {
+                            defaultPositions[type as WindowType] =
+                                pos as WindowPosition;
+                        }
+                    },
+                );
+                return settings.windowPositions as Record<
+                    WindowType,
+                    WindowPosition
+                >;
+            }
+        } catch {}
+        return defaultPositions;
+    }
+
     async saveWindowSize(
         windowType: WindowType,
         size: WindowSize,
@@ -57,4 +80,20 @@ export class SettingsManager {
             throw new Error(`Error saving window size: ${error}`);
         }
     }
+
+    async saveWindowPosition(
+        windowType: WindowType,
+        pos: { x: number; y: number },
+    ): Promise<void> {
+        try {
+            const settings = await this.getSettings();
+            settings.windowPositions = {
+                ...settings.windowPositions,
+                [windowType]: pos,
+            };
+            await this.updateSettings(settings);
+        } catch (error) {
+            throw new Error(`Error saving window position: ${error}`);
+        }
+    }
 }