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

Restore macOS full screen shortcut (#3939)

Browse source
This commit is contained in:
Tom Huzij 2020-02-12 16:56:28 -05:00 • committed by GitHub
parent 18fd44f504
commit 3f6d4486f6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
js/background.js
View file

@ -741,6 +741,7 @@
const commandKey = window.platform === 'darwin' && metaKey; const commandKey = window.platform === 'darwin' && metaKey;
const controlKey = window.platform !== 'darwin' && ctrlKey; const controlKey = window.platform !== 'darwin' && ctrlKey;
const commandOrCtrl = commandKey || controlKey; const commandOrCtrl = commandKey || controlKey;
const commandAndCtrl = commandKey && ctrlKey;
const state = store.getState(); const state = store.getState();
const selectedId = state.conversations.selectedConversation; const selectedId = state.conversations.selectedConversation;
@ -1013,7 +1014,12 @@
} }
// Search // Search
if (commandOrCtrl && !shiftKey && (key === 'f' || key === 'F')) { if (
commandOrCtrl &&
!commandAndCtrl &&
!shiftKey &&
(key === 'f' || key === 'F')
) {
const { startSearch } = actions.search; const { startSearch } = actions.search;
startSearch(); startSearch();
@ -1026,6 +1032,7 @@
if ( if (
conversation && conversation &&
commandOrCtrl && commandOrCtrl &&
!commandAndCtrl &&
shiftKey && shiftKey &&
(key === 'f' || key === 'F') (key === 'f' || key === 'F')
) { ) {