修复按键监听问题
parent
f61099ecad
commit
d927ac90e7
|
@ -51,7 +51,7 @@ div(:class="$style.container")
|
|||
</template>
|
||||
|
||||
<script>
|
||||
import { rendererSend, rendererOn, NAMES } from '../../../common/ipc'
|
||||
import { rendererSend, NAMES } from '../../../common/ipc'
|
||||
import { toRaw } from 'vue'
|
||||
|
||||
export default {
|
||||
|
@ -108,9 +108,6 @@ export default {
|
|||
},
|
||||
mounted() {
|
||||
this.config = JSON.parse(JSON.stringify(this.lrcConfig))
|
||||
rendererOn(NAMES.winLyric.key_down, (event, key) => {
|
||||
|
||||
})
|
||||
},
|
||||
methods: {
|
||||
sendEvent() {
|
||||
|
|
|
@ -20,7 +20,7 @@ rendererInvoke(NAMES.mainWindow.get_hot_key).then(({ local, global }) => {
|
|||
})
|
||||
|
||||
eventHub.on(baseName.bindKey, () => {
|
||||
keyBind.bindKey((key, type, event, keys) => {
|
||||
keyBind.bindKey((key, eventKey, type, event, keys) => {
|
||||
// console.log(`key_${key}_${type}`)
|
||||
eventHub.emit(baseName.key_down, { event, keys, key, type })
|
||||
// console.log(event, key)
|
||||
|
@ -38,7 +38,8 @@ eventHub.on(baseName.bindKey, () => {
|
|||
eventHub.emit(appHotKeyConfig.local.keys[key].action)
|
||||
return
|
||||
}
|
||||
eventHub.emit(`key_${key}_${type}`, { event, keys, key, type })
|
||||
eventHub.emit(`key_${key}_${type}`, { event, keys, key, eventKey, type })
|
||||
if (key != eventKey) eventHub.emit(`key_${eventKey}_${type}`, { event, keys, key, eventKey, type })
|
||||
})
|
||||
registerCommonEvents()
|
||||
})
|
||||
|
|
|
@ -3,12 +3,15 @@ import { isMac } from '../../common/utils'
|
|||
const downKeys = new Set()
|
||||
|
||||
const handleEvent = (type, event, keys) => {
|
||||
let eventKey = event.key
|
||||
if (isMac) {
|
||||
let index = keys.indexOf('meta')
|
||||
if (index > -1) keys.splice(index, 1, 'mod')
|
||||
if (eventKey == 'Meta') eventKey = 'mod'
|
||||
} else {
|
||||
let index = keys.indexOf('ctrl')
|
||||
if (index > -1) keys.splice(index, 1, 'mod')
|
||||
if (eventKey == 'Control') eventKey = 'mod'
|
||||
}
|
||||
let key = keys.join('+')
|
||||
|
||||
|
@ -20,7 +23,7 @@ const handleEvent = (type, event, keys) => {
|
|||
downKeys.delete(key)
|
||||
break
|
||||
}
|
||||
handleSendEvent(key, type, event, keys)
|
||||
handleSendEvent(key, eventKey, type, event, keys)
|
||||
}
|
||||
|
||||
// 修饰键处理
|
||||
|
|
Loading…
Reference in New Issue