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) => {

49
electron_app/src/tray.js
View file

@ -15,26 +15,21 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
const path = require('path');
const electron = require('electron');
const app = electron.app;
const Tray = electron.Tray;
const MenuItem = electron.MenuItem;
const {app, Tray, Menu, nativeImage} = require('electron');
let trayIcon = null;
exports.hasTray = function hasTray() {
return (trayIcon !== null);
}
};
exports.create = function (win, config) {
exports.create = function(win, config) {
// no trays on darwin
if (process.platform === 'darwin' || trayIcon) {
return;
}
const toggleWin = function () {
const toggleWin = function() {
if (win.isVisible() && !win.isMinimized()) {
win.hide();
} else {
@ -44,24 +39,48 @@ exports.create = function (win, config) {
}
};
const contextMenu = electron.Menu.buildFromTemplate([
const contextMenu = Menu.buildFromTemplate([
{
label: 'Show/Hide ' + config.brand,
click: toggleWin
click: toggleWin,
},
{
type: 'separator'
type: 'separator',
},
{
label: 'Quit',
click: function () {
click: function() {
app.quit();
}
}
},
},
]);
trayIcon = new Tray(config.icon_path);
trayIcon.setToolTip(config.brand);
trayIcon.setContextMenu(contextMenu);
trayIcon.on('click', toggleWin);
let lastFavicon = null;
win.webContents.on('page-favicon-updated', function(ev, favicons) {
let newFavicon = config.icon_path;
if (favicons && favicons.length > 0 && favicons[0].startsWith('data:')) {
newFavicon = favicons[0];
}
// No need to change, shortcut
if (newFavicon === lastFavicon) return;
lastFavicon = newFavicon;
// if its not default we have to construct into nativeImage
if (newFavicon !== config.icon_path) {
newFavicon = nativeImage.createFromDataURL(favicons[0]);
}
trayIcon.setImage(newFavicon);
win.setIcon(newFavicon);
});
win.webContents.on('page-title-updated', function(ev, title) {
trayIcon.setToolTip(title);
});
};