From 3b34d5cf9629aba5cd24efd07a4364b407a2c20b Mon Sep 17 00:00:00 2001 From: Sapphire Date: Mon, 4 May 2026 08:25:16 -0500 Subject: [PATCH] Restore old behaviour of maximize button toggling fullscreen (#1832) --- gui/electron/main/index.ts | 14 +++++++++----- gui/electron/preload/index.ts | 4 ++-- gui/electron/preload/interface.d.ts | 2 +- gui/electron/shared.ts | 4 +++- gui/src/components/TopBar.tsx | 2 +- 5 files changed, 16 insertions(+), 10 deletions(-) diff --git a/gui/electron/main/index.ts b/gui/electron/main/index.ts index eed84118d..68d66b12f 100644 --- a/gui/electron/main/index.ts +++ b/gui/electron/main/index.ts @@ -281,18 +281,22 @@ function createWindow() { }); handleIpc('window-actions', (e, action) => { + if (mainWindow === null) return; switch (action) { case 'close': - mainWindow?.close(); + mainWindow.close(); break; case 'hide': - mainWindow?.hide(); + mainWindow.hide(); break; case 'minimize': - mainWindow?.minimize(); + mainWindow.minimize(); break; - case 'maximize': - mainWindow?.maximize(); + case 'toggle-maximize': + if (mainWindow.isMaximized()) + mainWindow.unmaximize(); + else + mainWindow.maximize(); break; } }); diff --git a/gui/electron/preload/index.ts b/gui/electron/preload/index.ts index 43e0614a5..3eac6c1df 100644 --- a/gui/electron/preload/index.ts +++ b/gui/electron/preload/index.ts @@ -14,7 +14,7 @@ contextBridge.exposeInMainWorld('electronAPI', { close: () => ipcRenderer.invoke(IPC_CHANNELS.WINDOW_ACTIONS, 'close'), hide: () => ipcRenderer.invoke(IPC_CHANNELS.WINDOW_ACTIONS, 'hide'), minimize: () => ipcRenderer.invoke(IPC_CHANNELS.WINDOW_ACTIONS, 'minimize'), - maximize: () => ipcRenderer.invoke(IPC_CHANNELS.WINDOW_ACTIONS, 'maximize'), + toggleMaximize: () => ipcRenderer.invoke(IPC_CHANNELS.WINDOW_ACTIONS, 'toggle-maximize'), getStorage: async (type) => { return { get: (key) => @@ -37,5 +37,5 @@ contextBridge.exposeInMainWorld('electronAPI', { openFile: (path) => ipcRenderer.invoke(IPC_CHANNELS.OPEN_FILE, path), ghGet: (req) => ipcRenderer.invoke(IPC_CHANNELS.GH_FETCH, req), setPresence: (options) => ipcRenderer.invoke(IPC_CHANNELS.DISCORD_PRESENCE, options), - getInstallDir: () => ipcRenderer.invoke(IPC_CHANNELS.GET_FOLDER, 'exe') + getInstallDir: () => ipcRenderer.invoke(IPC_CHANNELS.GET_FOLDER, 'exe'), } satisfies IElectronAPI); diff --git a/gui/electron/preload/interface.d.ts b/gui/electron/preload/interface.d.ts index d75df5cc7..c3e66b55f 100644 --- a/gui/electron/preload/interface.d.ts +++ b/gui/electron/preload/interface.d.ts @@ -45,7 +45,7 @@ export interface IElectronAPI { close: () => void; hide: () => void; minimize: () => void; - maximize: () => void; + toggleMaximize: () => void; showDecorations: (decorations: boolean) => void; setTranslations: (translations: Record) => void; i18nOverride: () => Promise; diff --git a/gui/electron/shared.ts b/gui/electron/shared.ts index 96c74dc8d..0472c34a2 100644 --- a/gui/electron/shared.ts +++ b/gui/electron/shared.ts @@ -25,7 +25,9 @@ export const IPC_CHANNELS = { export interface IpcInvokeMap { [IPC_CHANNELS.OPEN_URL]: (url: string) => void; [IPC_CHANNELS.OS_STATS]: () => Promise; - [IPC_CHANNELS.WINDOW_ACTIONS]: (action: 'close' | 'minimize' | 'maximize' | 'hide') => void; + [IPC_CHANNELS.WINDOW_ACTIONS]: ( + action: 'close' | 'minimize' | 'toggle-maximize' | 'hide' + ) => void; [IPC_CHANNELS.LOG]: (type: 'info' | 'error' | 'warn', ...args: unknown[]) => void; [IPC_CHANNELS.OPEN_DIALOG]: ( options: OpenDialogOptions diff --git a/gui/src/components/TopBar.tsx b/gui/src/components/TopBar.tsx index 9b662e1b5..c87b500c1 100644 --- a/gui/src/components/TopBar.tsx +++ b/gui/src/components/TopBar.tsx @@ -234,7 +234,7 @@ export function TopBar({
electron.api.maximize()} + onClick={() => electron.api.toggleMaximize()} >