phlux/mattermostest
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[MM-40603] Add timeout for alt press to make sure it doesn't interfere with OS shortcuts (#1932)

Browse Source 
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
This commit is contained in:
Devin Binnie
2021-12-17 10:53:22 -05:00
committed by GitHub
parent c4e63fb3f9
commit 8474683ff1
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/views/MattermostView.ts
View File

@@ -61,6 +61,7 @@ export class MattermostView extends EventEmitter {
currentFavicon?: string; currentFavicon?: string;
hasBeenShown: boolean; hasBeenShown: boolean;
altTimeout?: number;
altLastPressed?: boolean; altLastPressed?: boolean;
contextMenu: ContextMenu; contextMenu: ContextMenu;
@@ -285,6 +286,7 @@ export class MattermostView extends EventEmitter {
// Handler for pressing the Alt key to focus the 3-dot menu // Handler for pressing the Alt key to focus the 3-dot menu
if (input.key === 'Alt' && input.type === 'keyUp' && this.altLastPressed) { if (input.key === 'Alt' && input.type === 'keyUp' && this.altLastPressed) {
this.altLastPressed = false; this.altLastPressed = false;
clearTimeout(this.altTimeout);
WindowManager.focusThreeDotMenu(); WindowManager.focusThreeDotMenu();
return; return;
} }
@@ -292,8 +294,12 @@ export class MattermostView extends EventEmitter {
// Hack to detect keyPress so that alt+<key> combinations don't default back to the 3-dot menu // Hack to detect keyPress so that alt+<key> combinations don't default back to the 3-dot menu
if (input.key === 'Alt' && input.type === 'keyDown') { if (input.key === 'Alt' && input.type === 'keyDown') {
this.altLastPressed = true; this.altLastPressed = true;
this.altTimeout = setTimeout(() => {
this.altLastPressed = false;
}, 500) as unknown as number;
} else { } else {
this.altLastPressed = false; this.altLastPressed = false;
clearTimeout(this.altTimeout);
} }
} }