mad-star-studio/element-web
2
0
Fork 0
Code Pull requests Activity

Merge pull request #3909 from vector-im/t3chguy/favicon_improvements

Browse source 
Electron Tray Improvements
This commit is contained in:
David Baker 2017-05-19 16:22:11 +01:00 • committed by GitHub
commit a9b5282ba3
6 changed files with 105 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

21
electron_app/src/electron-main.js
View file

@ -161,12 +161,31 @@ function startAutoUpdate(update_base_url) {
// no other way to catch this error).
// Assuming we generally run from the console when developing,
// this is far preferable.
process.on('uncaughtException', function (error) {
process.on('uncaughtException', function(error) {
console.log("Unhandled exception", error);
});
electron.ipcMain.on('install_update', installUpdate);
let focusHandlerAttached = false;
electron.ipcMain.on('setBadgeCount', function(ev, count) {
electron.app.setBadgeCount(count);
if (process.platform === 'win32' && mainWindow && !mainWindow.isFocused()) {
if (count > 0) {
if (!focusHandlerAttached) {
mainWindow.once('focus', () => {
mainWindow.flashFrame(false);
focusHandlerAttached = false;
});
focusHandlerAttached = true;
}
mainWindow.flashFrame(true);
} else {
mainWindow.flashFrame(false);
}
}
});
electron.app.commandLine.appendSwitch('--enable-usermedia-screen-capturing');
const shouldQuit = electron.app.makeSingleInstance((commandLine, workingDirectory) => {