PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Fix space keyboard shortcuts conflicting with native zoom shortcuts

Browse source
This commit is contained in:
Michael Telatynski 2021-09-14 16:02:15 +01:00
parent ae624658c9
commit 5a561b674f
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/vector/platform/ElectronPlatform.tsx
View file

@ -566,6 +566,7 @@ export default class ElectronPlatform extends VectorBasePlatform {
private navigateForwardBack(back: boolean) { private navigateForwardBack(back: boolean) {
this.ipcCall(back ? "navigateBack" : "navigateForward"); this.ipcCall(back ? "navigateBack" : "navigateForward");
} }
private navigateToSpace(num: number) { private navigateToSpace(num: number) {
dis.dispatch<SwitchSpacePayload>({ dis.dispatch<SwitchSpacePayload>({
action: Action.SwitchSpace, action: Action.SwitchSpace,
@ -599,6 +600,7 @@ export default class ElectronPlatform extends VectorBasePlatform {
// breaks skinning as the platform is instantiated prior to the skin being loaded // breaks skinning as the platform is instantiated prior to the skin being loaded
SettingsStore.getValue("feature_spaces") && SettingsStore.getValue("feature_spaces") &&
ev.code.startsWith("Digit") && ev.code.startsWith("Digit") &&
ev.code !== "Digit0" && // this is the shortcut for reset zoom, don't override it
isOnlyCtrlOrCmdKeyEvent(ev) isOnlyCtrlOrCmdKeyEvent(ev)
) { ) {
const spaceNumber = ev.code.slice(5); // Cut off the first 5 characters - "Digit" const spaceNumber = ev.code.slice(5); // Cut off the first 5 characters - "Digit"