mirror of
https://github.com/Kuingsmile/PicList.git
synced 2026-05-11 18:10:32 +08:00
🐛 Fix(custom): fix rename window position bug
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
2
src/universal/types/electron.d.ts
vendored
2
src/universal/types/electron.d.ts
vendored
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user