gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #4183 from vector-im/t3chguy/electron_logo_windows_weirdness 

to make the windows volume mixer not explode as it can't resize icons.
This commit is contained in:
Matthew Hodgson 2017-06-04 22:58:17 +01:00 committed by GitHub
parent 1bc30021c8 1e5a742602
commit 7b9ae0157a
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
electron_app/package.json
View File

@ -6,8 +6,9 @@
"description": "A feature-rich client for Matrix.org", "description": "A feature-rich client for Matrix.org",
"author": "Vector Creations Ltd.", "author": "Vector Creations Ltd.",
"dependencies": { "dependencies": {
"electron-window-state": "^4.1.0",
"auto-launch": "^5.0.1", "auto-launch": "^5.0.1",
"minimist": "^1.2.0" "electron-window-state": "^4.1.0",
"minimist": "^1.2.0",
"png-to-ico": "^1.0.2"
} }
} }

14
electron_app/src/tray.js
View File

@ -16,6 +16,9 @@ limitations under the License.
*/ */
const {app, Tray, Menu, nativeImage} = require('electron'); const {app, Tray, Menu, nativeImage} = require('electron');
const pngToIco = require('png-to-ico');
const path = require('path');
const fs = require('fs');
let trayIcon = null; let trayIcon = null;
@ -57,7 +60,7 @@ exports.create = function(win, config) {
trayIcon.on('click', toggleWin); trayIcon.on('click', toggleWin);
let lastFavicon = null; let lastFavicon = null;
win.webContents.on('page-favicon-updated', function(ev, favicons) { win.webContents.on('page-favicon-updated', async function(ev, favicons) {
let newFavicon = config.icon_path; let newFavicon = config.icon_path;
if (favicons && favicons.length > 0 && favicons[0].startsWith('data:')) { if (favicons && favicons.length > 0 && favicons[0].startsWith('data:')) {
newFavicon = favicons[0]; newFavicon = favicons[0];
@ -70,6 +73,15 @@ exports.create = function(win, config) {
// if its not default we have to construct into nativeImage // if its not default we have to construct into nativeImage
if (newFavicon !== config.icon_path) { if (newFavicon !== config.icon_path) {
newFavicon = nativeImage.createFromDataURL(favicons[0]); newFavicon = nativeImage.createFromDataURL(favicons[0]);
if (process.platform === 'win32') {
try {
const icoPath = path.join(app.getPath('temp'), 'win32_riot_icon.ico')
const icoBuf = await pngToIco(newFavicon.toPNG());
fs.writeFileSync(icoPath, icoBuf);
newFavicon = icoPath;
} catch (e) {console.error(e);}
}
} }
trayIcon.setImage(newFavicon); trayIcon.setImage(newFavicon);