From 5083019fd0ed2092bcba8a6334cb08e3860837f1 Mon Sep 17 00:00:00 2001 From: MrGarlic Date: Fri, 10 May 2024 14:37:30 -0400 Subject: [PATCH] change state to store display id only --- src/main/mainWindow.ts | 6 ++++-- src/shared/settings.d.ts | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/mainWindow.ts b/src/main/mainWindow.ts index 991f4e3..3ee1fd0 100644 --- a/src/main/mainWindow.ts +++ b/src/main/mainWindow.ts @@ -270,7 +270,9 @@ function getWindowBoundsOptions(): BrowserWindowConstructorOptions { height: height ?? DEFAULT_HEIGHT } as BrowserWindowConstructorOptions; - if (x != null && y != null && State.store.display && screen.getAllDisplays().includes(State.store.display)) { + const storedDisplay = screen.getAllDisplays().find(display => display.id === State.store.displayid); + + if (x != null && y != null && storedDisplay) { options.x = x; options.y = y; } @@ -318,7 +320,7 @@ function initWindowBoundsListeners(win: BrowserWindow) { const saveBounds = () => { State.store.windowBounds = win.getBounds(); - State.store.display = screen.getDisplayMatching(State.store.windowBounds); + State.store.displayid = screen.getDisplayMatching(State.store.windowBounds).id; }; win.on("resize", saveBounds); diff --git a/src/shared/settings.d.ts b/src/shared/settings.d.ts index eefcae0..4678751 100644 --- a/src/shared/settings.d.ts +++ b/src/shared/settings.d.ts @@ -4,7 +4,7 @@ * Copyright (c) 2023 Vendicated and Vencord contributors */ -import type { Display, Rectangle } from "electron"; +import type { Rectangle } from "electron"; export interface Settings { discordBranch?: "stable" | "canary" | "ptb"; @@ -36,7 +36,7 @@ export interface State { maximized?: boolean; minimized?: boolean; windowBounds?: Rectangle; - display?: Display; + displayid: int; skippedUpdate?: string; firstLaunch?: boolean;