Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix space shortcuts on layouts with non-English keys in the places of numbers #17780

Merged
merged 3 commits into from
Jul 15, 2021
Merged

Fix space shortcuts on layouts with non-English keys in the places of numbers #17780

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
76d9f26
Fix space shortcuts on non-English layouts
SimonBrandner Jun 25, 2021
f8da825
Better handling space shortcuts
SimonBrandner Jun 28, 2021
43695fb
Merge branch 'develop' into fix/space-shortcut-local/17776
t3chguy Jul 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 15 additions & 14 deletions src/vector/platform/ElectronPlatform.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,9 +575,9 @@ export default class ElectronPlatform extends VectorBasePlatform {
onKeyDown(ev: KeyboardEvent): boolean {
let handled = false;

switch (ev.key) {
case Key.SQUARE_BRACKET_LEFT:
case Key.SQUARE_BRACKET_RIGHT:
switch (ev.code) {
case "BracketLeft":
case "BracketRight":
SimonBrandner marked this conversation as resolved.
Show resolved Hide resolved
if (isMac && ev.metaKey && !ev.altKey && !ev.ctrlKey && !ev.shiftKey) {
this.navigateForwardBack(ev.key === Key.SQUARE_BRACKET_LEFT);
handled = true;
Expand All @@ -592,18 +592,19 @@ export default class ElectronPlatform extends VectorBasePlatform {
}
break;

case "1":
case "2":
case "3":
case "4":
case "5":
case "6":
case "7":
case "8":
case "9":
case "0":
case "Digit1":
case "Digit2":
case "Digit3":
case "Digit4":
case "Digit5":
case "Digit6":
case "Digit7":
case "Digit8":
case "Digit9":
case "Digit0":
if (SettingsStore.getValue("feature_spaces") && isOnlyCtrlOrCmdKeyEvent(ev)) {
this.navigateToSpace(parseInt(ev.key, 10));
const spaceNumber = ev.code.slice(5); // Cut off the first 5 characters - "Digit"
this.navigateToSpace(parseInt(spaceNumber, 10));
handled = true;
}
break;
Expand Down