PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Move default Electron icons outside asar

Browse source 
Electron doesn't seem to want to load icons from within `asar`s, so this changes
the default icons (used for window and tray) so that they are just regular files
on disk and updates the reference to match.

Part of https://github.com/vector-im/riot-web/issues/9897
This commit is contained in:
J. Ryan Stinnett 2019-06-18 16:12:38 +01:00
parent f10e7ac224
commit 292427c275
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -295,7 +295,10 @@ app.on('ready', () => {
console.log('No update_base_url is defined: auto update is disabled'); console.log('No update_base_url is defined: auto update is disabled');
} }
const iconPath = `${__dirname}/../img/riot.${process.platform === 'win32' ? 'ico' : 'png'}`; // It's important to call `path.join` so we don't end up with the packaged
// asar in the final path.
const iconFile = `riot.${process.platform === 'win32' ? 'ico' : 'png'}`;
const iconPath = path.join(__dirname, "..", "..", "img", iconFile);
// Load the previous window state with fallback to defaults // Load the previous window state with fallback to defaults
const mainWindowState = windowStateKeeper({ const mainWindowState = windowStateKeeper({

4
package.json
View file

@ -156,10 +156,10 @@
"electronVersion": "4.2.4", "electronVersion": "4.2.4",
"files": [ "files": [
"node_modules/**", "node_modules/**",
"src/**", "src/**"
"img/**"
], ],
"extraResources": [ "extraResources": [
{ "from": "electron_app/img", "to": "img" },
"webapp/**/*", "webapp/**/*",
"origin_migrator/**/*" "origin_migrator/**/*"
], ],