octoleo/nativefier
2
2
Fork 0
mirror of https://github.com/Llewellynvdm/nativefier.git synced 2024-09-22 17:49:02 +00:00
Code Issues Releases Activity

Fix unintentionally *global*/os-wide keyboard shortcuts (fix #930)

Browse Source
This commit is contained in:
Ronan Jouchet 2020-03-27 08:47:44 -04:00
parent 0c2510f31e
commit 139a5745c8
1 changed files with 39 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
app/src/components/menu.ts
View File

@ -1,10 +1,4 @@
import { import { Menu, clipboard, shell, MenuItemConstructorOptions } from 'electron';
Menu,
clipboard,
globalShortcut,
shell,
MenuItemConstructorOptions,
} from 'electron';
export function createMenu({ export function createMenu({
nativefierVersion, nativefierVersion,
@ -86,23 +80,35 @@ export function createMenu({
{ {
label: 'Back', label: 'Back',
accelerator: (() => { accelerator: (() => {
globalShortcut.register('CmdOrCtrl+[', goBack); // Used in old versions of Nativefier, kept for backwards compat.
const backKbShortcut = const backKbShortcut =
process.platform === 'darwin' ? 'Cmd+Left' : 'Alt+Left'; process.platform === 'darwin' ? 'Cmd+Left' : 'Alt+Left';
return backKbShortcut; return backKbShortcut;
})(), })(),
click: goBack, click: goBack,
}, },
{
label: 'BackAdditionalShortcut',
visible: false,
acceleratorWorksWhenHidden: true,
accelerator: 'CmdOrCtrl+[', // What old versions of Nativefier used, kept for backwards compat
click: goBack,
},
{ {
label: 'Forward', label: 'Forward',
accelerator: (() => { accelerator: (() => {
globalShortcut.register('CmdOrCtrl+]', goForward); // Used in old versions of Nativefier, kept for backwards compat.
const forwardKbShortcut = const forwardKbShortcut =
process.platform === 'darwin' ? 'Cmd+Right' : 'Alt+Right'; process.platform === 'darwin' ? 'Cmd+Right' : 'Alt+Right';
return forwardKbShortcut; return forwardKbShortcut;
})(), })(),
click: goForward, click: goForward,
}, },
{
label: 'ForwardAdditionalShortcut',
visible: false,
acceleratorWorksWhenHidden: true,
accelerator: 'CmdOrCtrl+]', // What old versions of Nativefier used, kept for backwards compat
click: goForward,
},
{ {
label: 'Reload', label: 'Reload',
accelerator: 'CmdOrCtrl+R', accelerator: 'CmdOrCtrl+R',
@ -131,26 +137,38 @@ export function createMenu({
}, },
{ {
label: 'Zoom In', label: 'Zoom In',
accelerator: (() => { accelerator: 'CmdOrCtrl+=',
globalShortcut.register('CmdOrCtrl+numadd', zoomIn); click: zoomIn,
return 'CmdOrCtrl+='; },
})(), {
label: 'ZoomInAdditionalShortcut',
visible: false,
acceleratorWorksWhenHidden: true,
accelerator: 'CmdOrCtrl+numadd',
click: zoomIn, click: zoomIn,
}, },
{ {
label: 'Zoom Out', label: 'Zoom Out',
accelerator: (() => { accelerator: 'CmdOrCtrl+-',
globalShortcut.register('CmdOrCtrl+numsub', zoomOut); click: zoomOut,
return 'CmdOrCtrl+-'; },
})(), {
label: 'ZoomOutAdditionalShortcut',
visible: false,
acceleratorWorksWhenHidden: true,
accelerator: 'CmdOrCtrl+numsub',
click: zoomOut, click: zoomOut,
}, },
{ {
label: zoomResetLabel, label: zoomResetLabel,
accelerator: (() => { accelerator: 'CmdOrCtrl+0',
globalShortcut.register('CmdOrCtrl+num0', zoomReset); click: zoomReset,
return 'CmdOrCtrl+0'; },
})(), {
label: 'ZoomResetAdditionalShortcut',
visible: false,
acceleratorWorksWhenHidden: true,
accelerator: 'CmdOrCtrl+num0',
click: zoomReset, click: zoomReset,
}, },
], ],