From 5e31cdd825f6970e1ebfb85a844fbae2d22da1a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Vani=C5=A1?= Date: Sat, 9 Dec 2023 14:05:57 +0100 Subject: [PATCH] Refactor window creation and maximize logic --- src/main/mainWindow.ts | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/mainWindow.ts b/src/main/mainWindow.ts index 86d474d..6e9a05c 100644 --- a/src/main/mainWindow.ts +++ b/src/main/mainWindow.ts @@ -453,12 +453,8 @@ export async function createWindows() { mainWin.webContents.on("did-finish-load", () => { splash.destroy(); - if (!startMinimized) mainWin!.show(); - if (Settings.store.maximized && !isDeckGameMode) { - mainWin!.maximize(); - if (startMinimized) mainWin!.hide(); - } + if (!startMinimized || isDeckGameMode) mainWin!.show(); if (isDeckGameMode) { // always use entire display @@ -468,5 +464,11 @@ export async function createWindows() { } }); + mainWin.once("show", () => { + if (Settings.store.maximized && !mainWin!.isMaximized() && !isDeckGameMode) { + mainWin!.maximize(); + } + }); + initArRPC(); }