Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Weblate 2017-08-03 14:21:40 +00:00
commit 03228d945d

View File

@ -228,6 +228,17 @@ electron.app.on('ready', () => {
} }
}); });
if (process.platform === 'win32') {
// Handle forward/backward mouse buttons in Windows
mainWindow.on('app-command', (e, cmd) => {
if (cmd === 'browser-backward' && mainWindow.webContents.canGoBack()) {
mainWindow.webContents.goBack();
} else if (cmd === 'browser-forward' && mainWindow.webContents.canGoForward()) {
mainWindow.webContents.goForward();
}
});
}
webContentsHandler(mainWindow.webContents); webContentsHandler(mainWindow.webContents);
mainWindowState.manage(mainWindow); mainWindowState.manage(mainWindow);
}); });