🚧 WIP: handle shortcut setting time

This commit is contained in:
PiEgg
2019-09-25 16:34:29 +08:00
parent b63ac03b84
commit 72e6e2aed5
5 changed files with 29 additions and 55 deletions

View File

@@ -29,7 +29,7 @@ import {
import {
shortKeyUpdater,
initShortKeyRegister
} from './utils/shortKeyRegister'
} from './utils/shortKeyHandler'
if (process.platform === 'darwin') {
beforeOpen()
}
@@ -309,9 +309,12 @@ const createSettingWindow = () => {
settingWindow.loadURL(settingWinURL)
settingWindow.on('closed', () => {
bus.emit('toggleShortKeyModifiedMode', false)
settingWindow = null
if (process.platform === 'linux') {
app.quit()
process.nextTick(() => {
app.quit()
})
}
})
createMenu()
@@ -506,8 +509,8 @@ ipcMain.on('getPicBeds', (evt) => {
evt.returnValue = picBeds
})
ipcMain.on('updateShortKey', (evt, val) => {
// console.log(val)
ipcMain.on('toggleShortKeyModifiedMode', (evt, val) => {
bus.emit('toggleShortKeyModifiedMode', val)
})
// const shortKeyHash = {

View File

@@ -1,9 +1,16 @@
import bus from '../utils/eventBus'
import bus from './eventBus'
let isInModifiedMode = false // 修改快捷键模式
bus.on('toggleShortKeyModifiedMode', flag => {
isInModifiedMode = flag
})
/**
*
* @param {string} name
*/
const shortKeyHandler = (name) => {
if (isInModifiedMode) {
return
}
if (name.includes('picgo:')) {
bus.emit(name)
} else if (name.includes('picgo-plugin-')) {