aaron/mattermost-desktop
1
0
Fork 0
Code Issues Pull requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #221 from timroes/flashWindowFix

Browse source 
Flash Window also without systray icon
This commit is contained in:
Yuya Ochiai 2016-07-26 23:07:58 +09:00 committed by GitHub
parent 6a99bdb72c 32509ad8c2
commit 6c26fa98a4
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/main.js
View file

@ -218,6 +218,13 @@ allowProtocolDialog.init(mainWindow);
// This method will be called when Electron has finished // This method will be called when Electron has finished
// initialization and is ready to create browser windows. // initialization and is ready to create browser windows.
app.on('ready', function() { app.on('ready', function() {
ipcMain.on('notified', function(event, arg) {
if (process.platform === 'win32' || process.platform === 'linux') {
if (config.notifications.flashWindow === 2) {
mainWindow.flashFrame(true);
}
}
});
if (shouldShowTrayIcon()) { if (shouldShowTrayIcon()) {
// set up tray icon // set up tray icon
trayIcon = new Tray(trayImages.normal); trayIcon = new Tray(trayImages.normal);
@ -261,12 +268,6 @@ app.on('ready', function() {
mainWindow.focus(); mainWindow.focus();
}); });
ipcMain.on('notified', function(event, arg) { ipcMain.on('notified', function(event, arg) {
if (process.platform === 'win32' || process.platform === 'linux') {
if (config.notifications.flashWindow === 2) {
mainWindow.flashFrame(true);
}
}
if (process.platform === 'win32') { if (process.platform === 'win32') {
// On Windows 8.1 and Windows 8, a shortcut with a Application User Model ID must be installed to the Start screen. // On Windows 8.1 and Windows 8, a shortcut with a Application User Model ID must be installed to the Start screen.
// In current version, use tray balloon for notification // In current version, use tray balloon for notification