mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions 1

Merge signalapp/Signal-Desktop#6304

Browse source
This commit is contained in:
Josh Perez 2023-02-22 16:08:50 -05:00
commit 7d13069da5
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ts/background.ts
View file

@ -1270,7 +1270,7 @@ export async function startApp(): Promise<void> {
}); });
document.addEventListener('keydown', event => { document.addEventListener('keydown', event => {
const { ctrlKey, metaKey, shiftKey } = event; const { ctrlKey, metaKey, shiftKey, altKey } = event;
const commandKey = window.platform === 'darwin' && metaKey; const commandKey = window.platform === 'darwin' && metaKey;
const controlKey = window.platform !== 'darwin' && ctrlKey; const controlKey = window.platform !== 'darwin' && ctrlKey;
@ -1286,7 +1286,7 @@ export async function startApp(): Promise<void> {
// Show keyboard shortcuts - handled by Electron-managed keyboard shortcuts // Show keyboard shortcuts - handled by Electron-managed keyboard shortcuts
// However, on linux Ctrl+/ selects all text, so we prevent that // However, on linux Ctrl+/ selects all text, so we prevent that
if (commandOrCtrl && key === '/') { if (commandOrCtrl && !altKey && key === '/') {
window.Events.showKeyboardShortcuts(); window.Events.showKeyboardShortcuts();
event.stopPropagation(); event.stopPropagation();