🐛 Fix(custom): fix rename window position bug

This commit is contained in:
Kuingsmile
2024-04-11 12:06:15 +08:00
parent a6e3542ed1
commit 1798220b30
3 changed files with 5 additions and 5 deletions

View File

@@ -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

View File

@@ -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)

View File

@@ -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