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

macOS shortcuts: Only listen for command key, not control key

Browse source
This commit is contained in:
Scott Nonnenberg 2019-12-17 10:52:36 -08:00 • committed by Ken Powers
parent d86e8ef7ec
commit 2c7baad68d
10 changed files with 59 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ts/components/MainHeader.tsx
View file

@ -1,6 +1,6 @@
import React from 'react';
import classNames from 'classnames';
import { debounce } from 'lodash';
import { debounce, get } from 'lodash';
import { Manager, Popper, Reference } from 'react-popper';
import { createPortal } from 'react-dom';
@ -222,10 +222,12 @@ export class MainHeader extends React.Component<PropsType, StateType> {
} = this.props;
const { ctrlKey, metaKey, key } = event;
const ctrlOrCommand = ctrlKey || metaKey;
const commandKey = get(window, 'platform') === 'darwin' && metaKey;
const controlKey = get(window, 'platform') !== 'darwin' && ctrlKey;
const commandOrCtrl = commandKey || controlKey;
// On linux, this keyboard combination selects all text
if (ctrlOrCommand && key === '/') {
if (commandOrCtrl && key === '/') {
event.preventDefault();
event.stopPropagation();