From 1798220b30a9e6d138e85767e9f6b98a31088fc9 Mon Sep 17 00:00:00 2001 From: Kuingsmile Date: Thu, 11 Apr 2024 12:06:15 +0800 Subject: [PATCH] :bug: Fix(custom): fix rename window position bug --- src/main/apis/app/window/windowList.ts | 4 ++-- src/main/apis/app/window/windowManager.ts | 4 ++-- src/universal/types/electron.d.ts | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/apis/app/window/windowList.ts b/src/main/apis/app/window/windowList.ts index 91d4e215..78bbb561 100644 --- a/src/main/apis/app/window/windowList.ts +++ b/src/main/apis/app/window/windowList.ts @@ -236,7 +236,7 @@ windowList.set(IWindowList.RENAME_WINDOW, { options: () => renameWindowOptions, async callback (window, windowManager) { window.loadURL(handleWindowParams(RENAME_WINDOW_URL)) - const currentWindow = windowManager.getAvailableWindow() + const currentWindow = windowManager.getAvailableWindow(true) if (currentWindow && currentWindow.isVisible()) { // bounds: { x: 821, y: 75, width: 800, height: 450 } const bounds = currentWindow.getBounds() @@ -259,7 +259,7 @@ windowList.set(IWindowList.TOOLBOX_WINDOW, { options: () => toolboxWindowOptions, async callback (window, windowManager) { window.loadURL(TOOLBOX_WINDOW_URL) - const currentWindow = windowManager.getAvailableWindow() + const currentWindow = windowManager.getAvailableWindow(true) if (currentWindow && currentWindow.isVisible()) { const bounds = currentWindow.getBounds() const positionX = bounds.x + bounds.width / 2 - 400 diff --git a/src/main/apis/app/window/windowManager.ts b/src/main/apis/app/window/windowManager.ts index 5fdebf70..195ba2ce 100644 --- a/src/main/apis/app/window/windowManager.ts +++ b/src/main/apis/app/window/windowManager.ts @@ -58,9 +58,9 @@ class WindowManager implements IWindowManager { } } - getAvailableWindow () { + getAvailableWindow (isSkipMiniWindow = false) { const miniWindow = this.windowMap.get(IWindowList.MINI_WINDOW) - if (miniWindow && miniWindow.isVisible()) { + if (miniWindow && miniWindow.isVisible() && !isSkipMiniWindow) { return miniWindow } else { const settingWindow = this.windowMap.get(IWindowList.SETTING_WINDOW) diff --git a/src/universal/types/electron.d.ts b/src/universal/types/electron.d.ts index d04caebb..eb3e35a0 100644 --- a/src/universal/types/electron.d.ts +++ b/src/universal/types/electron.d.ts @@ -15,7 +15,7 @@ declare interface IWindowManager { has: (name: IWindowList) => boolean // delete: (name: IWindowList) => void deleteById: (id: number) => void - getAvailableWindow: () => BrowserWindow + getAvailableWindow: (isSkipMiniWindow?: boolean) => BrowserWindow } type IpcRendererListener = (event: import('electron').IpcRendererEvent, ...args: any[]) => void