self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-11-24 08:12:24 +02:00
Code Issues Releases Activity

Fix window manager icon on linux (#1110)

Browse Source
This commit is contained in:
Caleb John 2019-01-09 10:05:28 -07:00 committed by Laurent Cozic
parent 7eebfae1c3
commit 88a9d5e802
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ElectronClient/app/ElectronAppWrapper.js
View File

@ -58,7 +58,7 @@ class ElectronAppWrapper {
// Linux icon workaround for bug https://github.com/electron-userland/electron-builder/issues/2098
// Fix: https://github.com/electron-userland/electron-builder/issues/2269
if (shim.isLinux()) windowOptions.icon = __dirname + '/build/icons/128x128.png';
if (shim.isLinux()) windowOptions.icon = path.join(__dirname, '..', 'build/icons/128x128.png');
require('electron-context-menu')({
shouldShowMenu: (event, params) => {
@ -231,4 +231,4 @@ class ElectronAppWrapper {
}
module.exports = { ElectronAppWrapper };
module.exports = { ElectronAppWrapper };

3
ElectronClient/app/package.json
View File

@ -58,6 +58,9 @@
"linux": {
"asar": false,
"category": "Office",
"desktop": {
"Icon": "joplin"
},
"target": "AppImage"
}
},