Joplin
/
joplin
mirror of https://github.com/laurent22/joplin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Desktop: Resolves #2031: Prevent window from being shown on startup when it should be hidden in tray

pull/2063/head
Laurent Cozic 2019-11-05 17:03:24 +00:00
parent cc51ba4f90
commit 67d2c454ee
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ElectronClient/app/ElectronAppWrapper.js
View File

@ -56,6 +56,9 @@ class ElectronAppWrapper {
webPreferences: { webPreferences: {
nodeIntegration: true, nodeIntegration: true,
}, },
// We start with a hidden window, which is then made visible depending on the showTrayIcon setting
// https://github.com/laurent22/joplin/issues/2031
show: false,
}; };
// Linux icon workaround for bug https://github.com/electron-userland/electron-builder/issues/2098 // Linux icon workaround for bug https://github.com/electron-userland/electron-builder/issues/2098

4
ElectronClient/app/app.js
View File

@ -1252,7 +1252,9 @@ class Application extends BaseApplication {
}, 1000 * 60 * 60); }, 1000 * 60 * 60);
if (Setting.value('startMinimized') && Setting.value('showTrayIcon')) { if (Setting.value('startMinimized') && Setting.value('showTrayIcon')) {
bridge().window().hide(); // Keep it hidden
} else {
bridge().window().show();
} }
ResourceService.runInBackground(); ResourceService.runInBackground();