jonny
/
Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Restore macOS full screen shortcut (#3939)

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