GuanM/tabby
1
0
Fork 0
mirror of https://github.com/Eugeny/tabby.git synced 2025-06-16 01:19:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed repeated hotkeys canceling themselves - fixes #5406, fixes #4566

Browse Source
This commit is contained in:
Eugene Pankov 2022-01-30 17:51:21 +01:00
parent 95152456ce
commit b664b9eed9
No known key found for this signature in database
GPG Key ID: 5896FCBBDD1CF4F4
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tabby-core/src/services/hotkeys.service.ts
View File

@ -130,9 +130,7 @@ export class HotkeysService {
const keyName = getKeyName(eventData) const keyName = getKeyName(eventData)
if (eventName === 'keydown') { if (eventName === 'keydown') {
this.addPressedKey(keyName, eventData) this.addPressedKey(keyName, eventData)
if (!nativeEvent.repeat) { this.recognitionPhase = true
this.recognitionPhase = true
}
this.updateModifiers(eventData) this.updateModifiers(eventData)
} }
if (eventName === 'keyup') { if (eventName === 'keyup') {
@ -158,8 +156,10 @@ export class HotkeysService {
const matched = this.matchActiveHotkey() const matched = this.matchActiveHotkey()
this.zone.run(() => { this.zone.run(() => {
if (matched && this.recognitionPhase) { if (matched) {
this.emitHotkeyOn(matched) if (this.recognitionPhase) {
this.emitHotkeyOn(matched)
}
} else if (this.pressedHotkey) { } else if (this.pressedHotkey) {
this.emitHotkeyOff(this.pressedHotkey) this.emitHotkeyOff(this.pressedHotkey)
} }
@ -288,10 +288,9 @@ export class HotkeysService {
private emitHotkeyOn (hotkey: string) { private emitHotkeyOn (hotkey: string) {
if (this.pressedHotkey) { if (this.pressedHotkey) {
if (this.pressedHotkey === hotkey) { if (this.pressedHotkey !== hotkey) {
return this.emitHotkeyOff(this.pressedHotkey)
} }
this.emitHotkeyOff(this.pressedHotkey)
} }
if (document.querySelectorAll('input:focus').length === 0) { if (document.querySelectorAll('input:focus').length === 0) {
console.debug('Matched hotkey', hotkey) console.debug('Matched hotkey', hotkey)