diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2020-10-27 13:05:03 +0100 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2020-10-27 13:05:03 +0100 |
| commit | 64f7b8fba73981dc4a52daf79924f50b2f1089d9 (patch) | |
| tree | 06d6ee5c70a312a85cba46c14f3748111e4398ca | |
| parent | e382e1125cb45c6503b9be9b10625fa954e0599e (diff) | |
| parent | a5a8afd0bed15fdcce765a5a59cd36d581e610e2 (diff) | |
| download | mullvadvpn-64f7b8fba73981dc4a52daf79924f50b2f1089d9.tar.xz mullvadvpn-64f7b8fba73981dc4a52daf79924f50b2f1089d9.zip | |
Merge branch 'enable-always-on-top-on-windows' into master
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | gui/src/main/index.ts | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 388c5ea94a..8ccb8f64fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -61,6 +61,7 @@ Line wrap the file at 100 chars. Th #### Windows - Fix log output encoding for Windows modules. +- Fix app not appearing on top in some situations when pressing the tray icon. #### Linux - Handle statically added routes. diff --git a/gui/src/main/index.ts b/gui/src/main/index.ts index 8339fb8d7a..6aa456b15e 100644 --- a/gui/src/main/index.ts +++ b/gui/src/main/index.ts @@ -1370,6 +1370,10 @@ class ApplicationMain { // setup window flags to mimic an overlay window return new BrowserWindow({ ...options, + // Due to a bug in Electron the app is sometimes placed behind other apps when opened. + // Setting alwaysOnTop to true ensures that the app is placed on top. Electron issue: + // https://github.com/electron/electron/issues/25915 + alwaysOnTop: true, transparent: true, skipTaskbar: true, }); |