github
/
lx-music-desktop
mirror of https://github.com/lyswhut/lx-music-desktop
1
0
Fork 0
Code Issues Releases Wiki Activity

修复按键监听问题

pull/930/merge
lyswhut 2022-04-08 14:04:50 +08:00
parent f61099ecad
commit d927ac90e7
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/renderer-lyric/components/core/ControlBar.vue
View File

@ -51,7 +51,7 @@ div(:class="$style.container")
</template> </template>
<script> <script>
import { rendererSend, rendererOn, NAMES } from '../../../common/ipc' import { rendererSend, NAMES } from '../../../common/ipc'
import { toRaw } from 'vue' import { toRaw } from 'vue'
export default { export default {
@ -108,9 +108,6 @@ export default {
}, },
mounted() { mounted() {
this.config = JSON.parse(JSON.stringify(this.lrcConfig)) this.config = JSON.parse(JSON.stringify(this.lrcConfig))
rendererOn(NAMES.winLyric.key_down, (event, key) => {
})
}, },
methods: { methods: {
sendEvent() { sendEvent() {

5
src/renderer/event/index.js
View File

@ -20,7 +20,7 @@ rendererInvoke(NAMES.mainWindow.get_hot_key).then(({ local, global }) => {
}) })
eventHub.on(baseName.bindKey, () => { eventHub.on(baseName.bindKey, () => {
keyBind.bindKey((key, type, event, keys) => { keyBind.bindKey((key, eventKey, type, event, keys) => {
// console.log(`key_${key}_${type}`) // console.log(`key_${key}_${type}`)
eventHub.emit(baseName.key_down, { event, keys, key, type }) eventHub.emit(baseName.key_down, { event, keys, key, type })
// console.log(event, key) // console.log(event, key)
@ -38,7 +38,8 @@ eventHub.on(baseName.bindKey, () => {
eventHub.emit(appHotKeyConfig.local.keys[key].action) eventHub.emit(appHotKeyConfig.local.keys[key].action)
return 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() registerCommonEvents()
}) })

5
src/renderer/utils/keyBind.js
View File

@ -3,12 +3,15 @@ import { isMac } from '../../common/utils'
const downKeys = new Set() const downKeys = new Set()
const handleEvent = (type, event, keys) => { const handleEvent = (type, event, keys) => {
let eventKey = event.key
if (isMac) { if (isMac) {
let index = keys.indexOf('meta') let index = keys.indexOf('meta')
if (index > -1) keys.splice(index, 1, 'mod') if (index > -1) keys.splice(index, 1, 'mod')
if (eventKey == 'Meta') eventKey = 'mod'
} else { } else {
let index = keys.indexOf('ctrl') let index = keys.indexOf('ctrl')
if (index > -1) keys.splice(index, 1, 'mod') if (index > -1) keys.splice(index, 1, 'mod')
if (eventKey == 'Control') eventKey = 'mod'
} }
let key = keys.join('+') let key = keys.join('+')
@ -20,7 +23,7 @@ const handleEvent = (type, event, keys) => {
downKeys.delete(key) downKeys.delete(key)
break break
} }
handleSendEvent(key, type, event, keys) handleSendEvent(key, eventKey, type, event, keys)
} }
// 修饰键处理 // 修饰键处理