From 4fa20df3862a38103bc5d12fde77822d85ad220d Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Wed, 12 Dec 2018 17:37:11 -0500 Subject: use local hotkeys not global fixes #759 --- electron_js/main.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'electron_js/main.js') diff --git a/electron_js/main.js b/electron_js/main.js index ecd5151a..c5af535a 100644 --- a/electron_js/main.js +++ b/electron_js/main.js @@ -75,7 +75,8 @@ function createAlternateWindow() { function createWindow() { -const mx = globalShortcut.register('CommandOrControl+Alt+F', () => { +// don't need these as we are using local menu bindings +/*const mx = globalShortcut.register('CommandOrControl+Alt+F', () => { console.log('Command Or Control+F is pressed'); isFs = !isFs; @@ -85,7 +86,8 @@ const mx = globalShortcut.register('CommandOrControl+Alt+F', () => { const dbgx = globalShortcut.register('CommandOrControl+Alt+D', () => { console.log('CommandOrControl+Alt+D is pressed'); win.webContents.openDevTools(); - }) + })*/ + /*const newwinx = globalShortcut.register('CommandOrControl+Alt+N', () => { console.log('CommandOrControl+Alt+N is pressed'); @@ -173,13 +175,13 @@ const mx = globalShortcut.register('CommandOrControl+Alt+F', () => { submenu: [ {role: 'reload'}, {role: 'forcereload'}, - {role: 'toggledevtools'}, + {role: 'toggledevtools', accelerator: 'CmdOrCtrl+Alt+D'}, {type: 'separator'}, {role: 'resetzoom'}, {role: 'zoomin'}, {role: 'zoomout'}, {type: 'separator'}, - {role: 'togglefullscreen'} + {role: 'togglefullscreen', accelerator: 'CmdOrCtrl+Alt+F'} ] }, { -- cgit v1.2.3