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

reworked hotkey handling - fixes #4355, fixes #4326, fixes #4340

Browse Source
This commit is contained in:
Eugene Pankov
2021-08-06 09:03:55 +02:00
parent 533837f5b7
commit 7b59ba4b73
6 changed files with 221 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,7 @@
import { Component, Input } from '@angular/core'
import { trigger, transition, style, animate } from '@angular/animations'
import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
import { HotkeysService, BaseComponent } from 'tabby-core'
import { HotkeysService, BaseComponent, Keystroke } from 'tabby-core'
const INPUT_TIMEOUT = 1000
@@ -36,7 +36,7 @@ const INPUT_TIMEOUT = 1000
],
})
export class HotkeyInputModalComponent extends BaseComponent {
@Input() value: string[] = []
@Input() value: Keystroke[] = []
@Input() timeoutProgress = 0
private lastKeyEvent: number|null = null
@@ -48,9 +48,9 @@ export class HotkeyInputModalComponent extends BaseComponent {
) {
super()
this.hotkeys.clearCurrentKeystrokes()
this.subscribeUntilDestroyed(hotkeys.key, (event) => {
this.subscribeUntilDestroyed(hotkeys.keystroke$, (keystroke) => {
this.lastKeyEvent = performance.now()
this.value = this.hotkeys.getCurrentKeySequence().map(x => x.value)
this.value.push(keystroke)
event.preventDefault()
event.stopPropagation()
})