tcjlj/PicList
1
0
Fork 0
mirror of https://github.com/Kuingsmile/PicList.git synced 2025-02-02 11:08:13 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed: #145 || changed rename window display position for more reasonable

Browse Source
This commit is contained in:
Molunerfinn 2018-12-13 17:05:08 +08:00
parent 0fe28ce675
commit cdf7e14548
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/utils/uploader.js
View File

@ -14,7 +14,7 @@ const STORE_PATH = app.getPath('userData')
const CONFIG_PATH = path.join(STORE_PATH, '/data.json') const CONFIG_PATH = path.join(STORE_PATH, '/data.json')
const renameURL = process.env.NODE_ENV === 'development' ? `http://localhost:9080/#rename-page` : `file://${__dirname}/index.html#rename-page` const renameURL = process.env.NODE_ENV === 'development' ? `http://localhost:9080/#rename-page` : `file://${__dirname}/index.html#rename-page`
const createRenameWindow = () => { const createRenameWindow = (win) => {
let options = { let options = {
height: 175, height: 175,
width: 300, width: 300,
@ -36,6 +36,20 @@ const createRenameWindow = () => {
const window = new BrowserWindow(options) const window = new BrowserWindow(options)
window.loadURL(renameURL) window.loadURL(renameURL)
// check if this window is visible
if (win.isVisible()) {
// bounds: { x: 821, y: 75, width: 800, height: 450 }
const bounds = win.getBounds()
const positionX = bounds.x + bounds.width / 2 - 150
let positionY
// if is the settingWindow
if (bounds.height > 400) {
positionY = bounds.y + bounds.height / 2 - 88
} else { // if is the miniWindow
positionY = bounds.y + bounds.height / 2
}
window.setPosition(positionX, positionY, false)
}
return window return window
} }
@ -61,6 +75,7 @@ const waitForRename = (window, id) => {
} }
const uploader = (img, type, webContents) => { const uploader = (img, type, webContents) => {
const win = BrowserWindow.fromWebContents(webContents)
const picgo = new PicGo(CONFIG_PATH) const picgo = new PicGo(CONFIG_PATH)
picgo.config.debug = true picgo.config.debug = true
let input = img let input = img
@ -78,7 +93,7 @@ const uploader = (img, type, webContents) => {
fileName = item.fileName fileName = item.fileName
} }
if (rename) { if (rename) {
const window = createRenameWindow() const window = createRenameWindow(win)
await waitForShow(window.webContents) await waitForShow(window.webContents)
window.webContents.send('rename', fileName, window.webContents.id) window.webContents.send('rename', fileName, window.webContents.id)
name = await waitForRename(window, window.webContents.id) name = await waitForRename(window, window.webContents.id)