修复在新建歌单输入框、歌单内歌曲搜索输入框会意外触发设置的全局快捷键的问题(#879)
This commit is contained in:
@@ -20,14 +20,15 @@ rendererInvoke(NAMES.mainWindow.get_hot_key).then(({ local, global }) => {
|
||||
})
|
||||
|
||||
eventHub.on(baseName.bindKey, () => {
|
||||
keyBind.bindKey((key, eventKey, type, event, keys) => {
|
||||
keyBind.bindKey((key, eventKey, type, event, keys, isEditing) => {
|
||||
// console.log(`key_${key}_${type}`)
|
||||
eventHub.emit(baseName.key_down, { event, keys, key, type })
|
||||
// console.log(event, key)
|
||||
// console.log(key, eventKey, type, event, keys)
|
||||
if (window.isEditingHotKey) return
|
||||
if (appHotKeyConfig.local.enable && appHotKeyConfig.local.keys[key]) {
|
||||
event?.preventDefault()
|
||||
if (window.isEditingHotKey || (isEditing && type == 'down') || event?.lx_handled) return
|
||||
if (event && appHotKeyConfig.local.enable && appHotKeyConfig.local.keys[key] && (key != 'escape' || !event.target.classList.contains('ignore-esc'))) {
|
||||
// console.log(key, eventKey, type, keys, isEditing)
|
||||
event.preventDefault()
|
||||
if (type == 'up') return
|
||||
|
||||
// 软件内快捷键的最小化触发时
|
||||
@@ -40,6 +41,7 @@ eventHub.on(baseName.bindKey, () => {
|
||||
eventHub.emit(appHotKeyConfig.local.keys[key].action)
|
||||
return
|
||||
}
|
||||
// console.log(`key_${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 })
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user