mirror of
https://github.com/kuaifan/dootask.git
synced 2025-12-14 04:32:49 +00:00
no message
This commit is contained in:
parent
bf75946e14
commit
94ac3c3922
14
electron/electron.js
vendored
14
electron/electron.js
vendored
@ -58,7 +58,8 @@ let childWindow = [],
|
|||||||
mediaType = null,
|
mediaType = null,
|
||||||
webTabWindow = null,
|
webTabWindow = null,
|
||||||
webTabView = [],
|
webTabView = [],
|
||||||
webTabHeight = 40;
|
webTabHeight = 40,
|
||||||
|
webTabClosedByShortcut = false;
|
||||||
|
|
||||||
let showState = {},
|
let showState = {},
|
||||||
onShowWindow = (win) => {
|
onShowWindow = (win) => {
|
||||||
@ -618,12 +619,15 @@ function createWebTabWindow(args) {
|
|||||||
})
|
})
|
||||||
|
|
||||||
webTabWindow.on('close', event => {
|
webTabWindow.on('close', event => {
|
||||||
|
if (webTabClosedByShortcut) {
|
||||||
|
webTabClosedByShortcut = false
|
||||||
if (!willQuitApp) {
|
if (!willQuitApp) {
|
||||||
closeWebTab(0)
|
closeWebTab(0)
|
||||||
event.preventDefault()
|
event.preventDefault()
|
||||||
} else {
|
return
|
||||||
userConf.set('webTabWindow', webTabWindow.getBounds())
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
userConf.set('webTabWindow', webTabWindow.getBounds())
|
||||||
})
|
})
|
||||||
|
|
||||||
webTabWindow.on('closed', () => {
|
webTabWindow.on('closed', () => {
|
||||||
@ -650,6 +654,8 @@ function createWebTabWindow(args) {
|
|||||||
if (utils.isMetaOrControl(input) && input.key.toLowerCase() === 'r') {
|
if (utils.isMetaOrControl(input) && input.key.toLowerCase() === 'r') {
|
||||||
reloadWebTab(0)
|
reloadWebTab(0)
|
||||||
event.preventDefault()
|
event.preventDefault()
|
||||||
|
} else if (utils.isMetaOrControl(input) && input.key.toLowerCase() === 'w') {
|
||||||
|
webTabClosedByShortcut = true
|
||||||
} else if (utils.isMetaOrControl(input) && input.shift && input.key.toLowerCase() === 'i') {
|
} else if (utils.isMetaOrControl(input) && input.shift && input.key.toLowerCase() === 'i') {
|
||||||
devToolsWebTab(0)
|
devToolsWebTab(0)
|
||||||
}
|
}
|
||||||
@ -745,6 +751,8 @@ function createWebTabWindow(args) {
|
|||||||
if (utils.isMetaOrControl(input) && input.key.toLowerCase() === 'r') {
|
if (utils.isMetaOrControl(input) && input.key.toLowerCase() === 'r') {
|
||||||
browserView.webContents.reload()
|
browserView.webContents.reload()
|
||||||
event.preventDefault()
|
event.preventDefault()
|
||||||
|
} else if (utils.isMetaOrControl(input) && input.key.toLowerCase() === 'w') {
|
||||||
|
webTabClosedByShortcut = true
|
||||||
} else if (utils.isMetaOrControl(input) && input.shift && input.key.toLowerCase() === 'i') {
|
} else if (utils.isMetaOrControl(input) && input.shift && input.key.toLowerCase() === 'i') {
|
||||||
browserView.webContents.toggleDevTools()
|
browserView.webContents.toggleDevTools()
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user