From aecc645a1a22176dce54c67edc114c43d9ff4e2a Mon Sep 17 00:00:00 2001 From: Faisal Amir Date: Tue, 11 Jun 2024 18:46:00 +0700 Subject: [PATCH] fix: bring back maximize button (#3024) --- electron/handlers/native.ts | 9 +++------ electron/managers/mainWindowConfig.ts | 3 ++- web/containers/Layout/TopPanel/index.tsx | 13 ++++++++++--- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/electron/handlers/native.ts b/electron/handlers/native.ts index 1bc815b41..869b9fd58 100644 --- a/electron/handlers/native.ts +++ b/electron/handlers/native.ts @@ -1,4 +1,4 @@ -import { app, ipcMain, dialog, shell, nativeTheme, screen } from 'electron' +import { app, ipcMain, dialog, shell, nativeTheme } from 'electron' import { join } from 'path' import { windowManager } from '../managers/window' import { @@ -41,12 +41,9 @@ export function handleAppIPCs() { windowManager.mainWindow?.minimize() }) - ipcMain.handle(NativeRoute.setMaximizeApp, async () => { + ipcMain.handle(NativeRoute.setMaximizeApp, async (_event) => { if (windowManager.mainWindow?.isMaximized()) { - // const bounds = await getBounds() - // windowManager.mainWindow?.setSize(bounds.width, bounds.height) - // windowManager.mainWindow?.setPosition(Number(bounds.x), Number(bounds.y)) - windowManager.mainWindow.restore() + windowManager.mainWindow.unmaximize() } else { windowManager.mainWindow?.maximize() } diff --git a/electron/managers/mainWindowConfig.ts b/electron/managers/mainWindowConfig.ts index 25f0635f7..c3f9c01bd 100644 --- a/electron/managers/mainWindowConfig.ts +++ b/electron/managers/mainWindowConfig.ts @@ -4,11 +4,12 @@ export const mainWindowConfig: Electron.BrowserWindowConstructorOptions = { skipTaskbar: false, minWidth: DEFAULT_MIN_WIDTH, show: true, + transparent: true, + frame: false, titleBarStyle: 'hidden', vibrancy: 'fullscreen-ui', visualEffectState: 'active', backgroundMaterial: 'acrylic', - maximizable: false, autoHideMenuBar: true, trafficLightPosition: { x: 16, diff --git a/web/containers/Layout/TopPanel/index.tsx b/web/containers/Layout/TopPanel/index.tsx index e2966e4da..ac2c23a99 100644 --- a/web/containers/Layout/TopPanel/index.tsx +++ b/web/containers/Layout/TopPanel/index.tsx @@ -9,6 +9,7 @@ import { PanelRightCloseIcon, MinusIcon, MenuIcon, + SquareIcon, PaletteIcon, XIcon, } from 'lucide-react' @@ -51,7 +52,7 @@ const TopPanel = () => { +