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

Use physical keys+layout for shortcuts

Browse source
This commit is contained in:
Fedor Indutny 2021-09-29 14:20:52 -07:00 • committed by Fedor Indutnyy
parent b6cfe0933d
commit 3e31a7405b
5 changed files with 50 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ts/components/CallScreen.tsx
View file

@ -40,6 +40,7 @@ import { GroupCallRemoteParticipants } from './GroupCallRemoteParticipants';
import { LocalizerType } from '../types/Util';
import { NeedsScreenRecordingPermissionsModal } from './NeedsScreenRecordingPermissionsModal';
import { missingCaseError } from '../util/missingCaseError';
import * as KeyboardLayout from '../services/keyboardLayout';
import { useActivateSpeakerViewOnPresenting } from '../hooks/useActivateSpeakerViewOnPresenting';
export type PropsType = {
@ -205,10 +206,12 @@ export const CallScreen: React.FC<PropsType> = ({
const handleKeyDown = (event: KeyboardEvent): void => {
let eventHandled = false;
if (event.shiftKey && (event.key === 'V' || event.key === 'v')) {
const key = KeyboardLayout.lookup(event);
if (event.shiftKey && (key === 'V' || key === 'v')) {
toggleVideo();
eventHandled = true;
} else if (event.shiftKey && (event.key === 'M' || event.key === 'm')) {
} else if (event.shiftKey && (key === 'M' || key === 'm')) {
toggleAudio();
eventHandled = true;
}

6
ts/components/CallingLobby.tsx
View file

@ -19,6 +19,7 @@ import {
} from './CallingLobbyJoinButton';
import { AvatarColorType } from '../types/Colors';
import { LocalizerType } from '../types/Util';
import * as KeyboardLayout from '../services/keyboardLayout';
import { ConversationType } from '../state/ducks/conversations';
import { isConversationTooBigToRing } from '../conversations/isConversationTooBigToRing';
@ -116,10 +117,11 @@ export const CallingLobby = ({
function handleKeyDown(event: KeyboardEvent): void {
let eventHandled = false;
if (event.shiftKey && (event.key === 'V' || event.key === 'v')) {
const key = KeyboardLayout.lookup(event);
if (event.shiftKey && (key === 'V' || key === 'v')) {
toggleVideo();
eventHandled = true;
} else if (event.shiftKey && (event.key === 'M' || event.key === 'm')) {
} else if (event.shiftKey && (key === 'M' || key === 'm')) {
toggleAudio();
eventHandled = true;
}

5
ts/components/conversation/Message.tsx
View file

@ -67,6 +67,7 @@ import { emojiToData } from '../emoji/lib';
import type { SmartReactionPicker } from '../../state/smart/ReactionPicker';
import { getCustomColorStyle } from '../../util/getCustomColorStyle';
import { offsetDistanceModifier } from '../../util/popperUtil';
import * as KeyboardLayout from '../../services/keyboardLayout';
type Trigger = {
handleContextClick: (event: React.MouseEvent<HTMLDivElement>) => void;
@ -2283,8 +2284,10 @@ export class Message extends React.PureComponent<Props, State> {
// Do not allow reactions to error messages
const { canReply } = this.props;
const key = KeyboardLayout.lookup(event.nativeEvent);
if (
(event.key === 'E' || event.key === 'e') &&
(key === 'E' || key === 'e') &&
(event.metaKey || event.ctrlKey) &&
event.shiftKey &&
canReply