From 0e6f7bc804db5fdf2f24c4ec5260c17f2f687446 Mon Sep 17 00:00:00 2001 From: Redeven <18680184+redeven@users.noreply.github.com> Date: Tue, 2 Jan 2024 07:19:56 -0300 Subject: [PATCH 1/5] feat: Add start minimized as a launch argument --- src/main/mainWindow.ts | 14 +++++++++----- src/main/splash.ts | 5 +++-- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/main/mainWindow.ts b/src/main/mainWindow.ts index 8fdb6ee4..c34e351d 100644 --- a/src/main/mainWindow.ts +++ b/src/main/mainWindow.ts @@ -442,7 +442,8 @@ function createMainWindow() { const runVencordMain = once(() => require(join(VENCORD_FILES_DIR, "vencordDesktopMain.js"))); export async function createWindows() { - const splash = createSplashWindow(); + const startMinimized = process.argv.includes("--start-minimized"); + const splash = createSplashWindow(startMinimized); // SteamOS letterboxes and scales it terribly, so just full screen it if (isDeckGameMode) splash.setFullScreen(true); await ensureVencordFiles(); @@ -452,11 +453,8 @@ export async function createWindows() { mainWin.webContents.on("did-finish-load", () => { splash.destroy(); - mainWin!.show(); - if (Settings.store.maximized && !isDeckGameMode) { - mainWin!.maximize(); - } + if (!startMinimized || isDeckGameMode) mainWin!.show(); if (isDeckGameMode) { // always use entire display @@ -464,6 +462,12 @@ export async function createWindows() { askToApplySteamLayout(mainWin); } + + mainWin.once("show", () => { + if (Settings.store.maximized && !mainWin!.isMaximized() && !isDeckGameMode) { + mainWin!.maximize(); + } + }); }); initArRPC(); diff --git a/src/main/splash.ts b/src/main/splash.ts index f21799d0..7c05de9f 100644 --- a/src/main/splash.ts +++ b/src/main/splash.ts @@ -11,10 +11,11 @@ import { ICON_PATH, VIEW_DIR } from "shared/paths"; import { Settings } from "./settings"; -export function createSplashWindow() { +export function createSplashWindow(startMinimized = false) { const splash = new BrowserWindow({ ...SplashProps, - icon: ICON_PATH + icon: ICON_PATH, + show: !startMinimized }); splash.loadFile(join(VIEW_DIR, "splash.html")); From 388d70e51205f33c993eeedfc4b955ad3fbd11a6 Mon Sep 17 00:00:00 2001 From: V Date: Sun, 7 Jan 2024 03:06:43 +0100 Subject: [PATCH 2/5] derp merge --- src/main/mainWindow.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/mainWindow.ts b/src/main/mainWindow.ts index 3e1b8b81..928a9223 100644 --- a/src/main/mainWindow.ts +++ b/src/main/mainWindow.ts @@ -458,9 +458,7 @@ export async function createWindows() { mainWin.webContents.on("did-finish-load", () => { splash.destroy(); - if (State.store.maximized && !isDeckGameMode) { - mainWin!.maximize(); - } + if (!startMinimized || isDeckGameMode) mainWin!.show(); if (isDeckGameMode) { // always use entire display From a391dd626466cabffe477327a1492002e18d05aa Mon Sep 17 00:00:00 2001 From: V Date: Sun, 7 Jan 2024 03:07:57 +0100 Subject: [PATCH 3/5] Update mainWindow.ts --- src/main/mainWindow.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/mainWindow.ts b/src/main/mainWindow.ts index 928a9223..d2686f8d 100644 --- a/src/main/mainWindow.ts +++ b/src/main/mainWindow.ts @@ -458,7 +458,7 @@ export async function createWindows() { mainWin.webContents.on("did-finish-load", () => { splash.destroy(); - if (!startMinimized || isDeckGameMode) mainWin!.show(); + if (!startMinimized) mainWin!.show(); if (isDeckGameMode) { // always use entire display From 7e0637cad6440e6bd13b7288a1c2805d8993ac09 Mon Sep 17 00:00:00 2001 From: V Date: Sun, 7 Jan 2024 03:09:11 +0100 Subject: [PATCH 4/5] Update mainWindow.ts --- src/main/mainWindow.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/mainWindow.ts b/src/main/mainWindow.ts index d2686f8d..8522c261 100644 --- a/src/main/mainWindow.ts +++ b/src/main/mainWindow.ts @@ -459,6 +459,9 @@ export async function createWindows() { splash.destroy(); if (!startMinimized) mainWin!.show(); + else if (State.store.maximized && !isDeckGameMode) { + mainWin!.maximize(); + } if (isDeckGameMode) { // always use entire display From b1f574d73c706280dc42459168c95a49bb5bc80a Mon Sep 17 00:00:00 2001 From: Vendicated Date: Sun, 7 Jan 2024 03:10:13 +0100 Subject: [PATCH 5/5] im dumb --- src/main/mainWindow.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/mainWindow.ts b/src/main/mainWindow.ts index 8522c261..2561c432 100644 --- a/src/main/mainWindow.ts +++ b/src/main/mainWindow.ts @@ -458,9 +458,9 @@ export async function createWindows() { mainWin.webContents.on("did-finish-load", () => { splash.destroy(); - if (!startMinimized) mainWin!.show(); - else if (State.store.maximized && !isDeckGameMode) { - mainWin!.maximize(); + if (!startMinimized) { + mainWin!.show(); + if (State.store.maximized && !isDeckGameMode) mainWin!.maximize(); } if (isDeckGameMode) {