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

more hotkey fixes

Browse Source
This commit is contained in:
Eugene Pankov 2021-08-06 09:52:34 +02:00
parent 08f1ad4c75
commit eadd8d563e
No known key found for this signature in database
GPG Key ID: 5896FCBBDD1CF4F4
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -128,7 +128,7 @@ export class HotkeysService {
const keyName = getKeyName(eventData) const keyName = getKeyName(eventData)
if (eventName === 'keydown') { if (eventName === 'keydown') {
this.addPressedKey(eventData) this.addPressedKey(keyName, eventData)
this.shouldSaveNextKeystroke = true this.shouldSaveNextKeystroke = true
this.updateModifiers(eventData) this.updateModifiers(eventData)
} }
@ -272,6 +272,9 @@ export class HotkeysService {
if (!event[prop] && this.pressedKeys.has(key)) { if (!event[prop] && this.pressedKeys.has(key)) {
this.removePressedKey(key) this.removePressedKey(key)
} }
if (event[prop] && !this.pressedKeys.has(key)) {
this.addPressedKey(key, event)
}
} }
} }
@ -324,8 +327,7 @@ export class HotkeysService {
return keys return keys
} }
private addPressedKey (eventData: KeyEventData) { private addPressedKey (keyName: KeyName, eventData: KeyEventData) {
const keyName = getKeyName(eventData)
this.pressedKeys.add(keyName) this.pressedKeys.add(keyName)
this.pressedKeyTimestamps.set(keyName, eventData.registrationTime) this.pressedKeyTimestamps.set(keyName, eventData.registrationTime)
} }

8
tabby-settings/src/components/hotkeyInputModal.component.ts
View File

@ -48,12 +48,14 @@ export class HotkeyInputModalComponent extends BaseComponent {
) { ) {
super() super()
this.hotkeys.clearCurrentKeystrokes() this.hotkeys.clearCurrentKeystrokes()
this.subscribeUntilDestroyed(hotkeys.keystroke$, (keystroke) => { this.subscribeUntilDestroyed(hotkeys.keyEvent$, event => {
this.lastKeyEvent = performance.now()
this.value.push(keystroke)
event.preventDefault() event.preventDefault()
event.stopPropagation() event.stopPropagation()
}) })
this.subscribeUntilDestroyed(hotkeys.keystroke$, keystroke => {
this.lastKeyEvent = performance.now()
this.value.push(keystroke)
})
} }
splitKeys (keys: string): string[] { splitKeys (keys: string): string[] {