GithubBackup/PicList
1
0
Fork 0
mirror of https://github.com/Kuingsmile/PicList.git synced 2026-09-07 16:36:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

🐛 Fix(custom): fix rename window position bug

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
src/main/apis/app/window/windowList.ts
+2 -2
View File
@@ -236,7 +236,7 @@ windowList.set(IWindowList.RENAME_WINDOW, {
options: () => renameWindowOptions, options: () => renameWindowOptions,
async callback (window, windowManager) { async callback (window, windowManager) {
window.loadURL(handleWindowParams(RENAME_WINDOW_URL)) window.loadURL(handleWindowParams(RENAME_WINDOW_URL))
const currentWindow = windowManager.getAvailableWindow() const currentWindow = windowManager.getAvailableWindow(true)
if (currentWindow && currentWindow.isVisible()) { if (currentWindow && currentWindow.isVisible()) {
// bounds: { x: 821, y: 75, width: 800, height: 450 } // bounds: { x: 821, y: 75, width: 800, height: 450 }
const bounds = currentWindow.getBounds() const bounds = currentWindow.getBounds()
@@ -259,7 +259,7 @@ windowList.set(IWindowList.TOOLBOX_WINDOW, {
options: () => toolboxWindowOptions, options: () => toolboxWindowOptions,
async callback (window, windowManager) { async callback (window, windowManager) {
window.loadURL(TOOLBOX_WINDOW_URL) window.loadURL(TOOLBOX_WINDOW_URL)
const currentWindow = windowManager.getAvailableWindow() const currentWindow = windowManager.getAvailableWindow(true)
if (currentWindow && currentWindow.isVisible()) { if (currentWindow && currentWindow.isVisible()) {
const bounds = currentWindow.getBounds() const bounds = currentWindow.getBounds()
const positionX = bounds.x + bounds.width / 2 - 400 const positionX = bounds.x + bounds.width / 2 - 400
src/main/apis/app/window/windowManager.ts
+2 -2
View File
@@ -58,9 +58,9 @@ class WindowManager implements IWindowManager {
} }
} }
getAvailableWindow () { getAvailableWindow (isSkipMiniWindow = false) {
const miniWindow = this.windowMap.get(IWindowList.MINI_WINDOW) const miniWindow = this.windowMap.get(IWindowList.MINI_WINDOW)
if (miniWindow && miniWindow.isVisible()) { if (miniWindow && miniWindow.isVisible() && !isSkipMiniWindow) {
return miniWindow return miniWindow
} else { } else {
const settingWindow = this.windowMap.get(IWindowList.SETTING_WINDOW) const settingWindow = this.windowMap.get(IWindowList.SETTING_WINDOW)
src/universal/types/electron.d.ts
Vendored
+1 -1
View File
@@ -15,7 +15,7 @@ declare interface IWindowManager {
has: (name: IWindowList) => boolean has: (name: IWindowList) => boolean
// delete: (name: IWindowList) => void // delete: (name: IWindowList) => void
deleteById: (id: number) => void deleteById: (id: number) => void
getAvailableWindow: () => BrowserWindow getAvailableWindow: (isSkipMiniWindow?: boolean) => BrowserWindow
} }
type IpcRendererListener = (event: import('electron').IpcRendererEvent, ...args: any[]) => void type IpcRendererListener = (event: import('electron').IpcRendererEvent, ...args: any[]) => void