mirror of
https://github.com/kuaifan/dootask.git
synced 2025-12-17 14:42:51 +00:00
fix: 全屏预览图片关闭窗口
This commit is contained in:
parent
e5c8748b75
commit
a6c7c0c7ad
20
electron/electron.js
vendored
20
electron/electron.js
vendored
@ -163,7 +163,14 @@ function createMainWindow() {
|
|||||||
if (!willQuitApp) {
|
if (!willQuitApp) {
|
||||||
utils.onBeforeUnload(event, mainWindow).then(() => {
|
utils.onBeforeUnload(event, mainWindow).then(() => {
|
||||||
if (['darwin', 'win32'].includes(process.platform)) {
|
if (['darwin', 'win32'].includes(process.platform)) {
|
||||||
mainWindow.hide();
|
if (mainWindow.isFullScreen()) {
|
||||||
|
mainWindow.once('leave-full-screen', () => {
|
||||||
|
mainWindow.hide();
|
||||||
|
})
|
||||||
|
mainWindow.setFullScreen(false)
|
||||||
|
} else {
|
||||||
|
mainWindow.hide();
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
app.quit();
|
app.quit();
|
||||||
}
|
}
|
||||||
@ -497,8 +504,15 @@ function createMediaWindow(args, type = 'image') {
|
|||||||
mediaWindow.addListener('close', event => {
|
mediaWindow.addListener('close', event => {
|
||||||
if (!willQuitApp) {
|
if (!willQuitApp) {
|
||||||
event.preventDefault()
|
event.preventDefault()
|
||||||
mediaWindow.webContents.send('on-close');
|
if (mediaWindow.isFullScreen()) {
|
||||||
mediaWindow.hide();
|
mediaWindow.once('leave-full-screen', () => {
|
||||||
|
mediaWindow.hide();
|
||||||
|
})
|
||||||
|
mediaWindow.setFullScreen(false)
|
||||||
|
} else {
|
||||||
|
mediaWindow.webContents.send('on-close');
|
||||||
|
mediaWindow.hide();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user