self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-01-26 18:58:21 +02:00
Code Issues Releases Activity

Desktop: Fixes #8256: Don't start window minimized in GNOME (#8441)

Browse Source
This commit is contained in:
Henry Heino 2023-07-10 03:59:09 -07:00 committed by GitHub
parent 383e9d4e46
commit 7ef591f3a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/app-desktop/ElectronAppWrapper.ts
View File

@ -100,7 +100,10 @@ export default class ElectronAppWrapper {
webviewTag: true, webviewTag: true,
// We start with a hidden window, which is then made visible depending on the showTrayIcon setting // We start with a hidden window, which is then made visible depending on the showTrayIcon setting
// https://github.com/laurent22/joplin/issues/2031 // https://github.com/laurent22/joplin/issues/2031
show: debugEarlyBugs, //
// On Linux/GNOME, however, the window doesn't show correctly if show is false initially:
// https://github.com/laurent22/joplin/issues/8256
show: debugEarlyBugs || shim.isGNOME(),
}; };
// 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

2
packages/app-desktop/app.ts
View File

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

7
packages/lib/shim.ts
View File

@ -57,6 +57,13 @@ const shim = {
return process && process.platform === 'linux'; return process && process.platform === 'linux';
}, },
isGNOME: () => {
// XDG_CURRENT_DESKTOP may be something like "ubuntu:GNOME" and not just "GNOME".
// Thus, we use .includes and not ===.
return (shim.isLinux() || shim.isFreeBSD())
&& process && (process.env['XDG_CURRENT_DESKTOP'] ?? '').includes('GNOME');
},
isFreeBSD: () => { isFreeBSD: () => {
return process && process.platform === 'freebsd'; return process && process.platform === 'freebsd';
}, },