summaryrefslogtreecommitdiffhomepage
path: root/gui/src/main
diff options
context:
space:
mode:
authorOskar Nyberg <oskar@mullvad.net>2023-01-10 10:11:57 +0100
committerOskar Nyberg <oskar@mullvad.net>2023-01-10 10:11:57 +0100
commit197ad90a78226203ae188dfdfd84f063a1ea51ae (patch)
treebb4534869fdf3e64638617c2a61415c262ef7fa6 /gui/src/main
parent17c36c1a83fa263c634b2abf37c6007481df0139 (diff)
parentf844066056eeb5ee1b9f650c1928f996645df5ab (diff)
downloadmullvadvpn-197ad90a78226203ae188dfdfd84f063a1ea51ae.tar.xz
mullvadvpn-197ad90a78226203ae188dfdfd84f063a1ea51ae.zip
Merge branch 'fix-content-height'
Diffstat (limited to 'gui/src/main')
-rw-r--r--gui/src/main/window-controller.ts5
1 files changed, 1 insertions, 4 deletions
diff --git a/gui/src/main/window-controller.ts b/gui/src/main/window-controller.ts
index c03a4e9ab3..5cd0857bc4 100644
--- a/gui/src/main/window-controller.ts
+++ b/gui/src/main/window-controller.ts
@@ -318,10 +318,7 @@ export default class WindowController {
case 'win32':
// On Windows the app height ends up slightly lower than we set it to if running in unpinned
// mode and the app becomes a tiny bit taller when pinned to task bar.
- return unpinnedWindow ? contentHeight + 19 : contentHeight - 1;
- case 'linux':
- // On Linux the app ends up slightly lower than we set it to.
- return contentHeight - 25;
+ return unpinnedWindow ? contentHeight + 25 : contentHeight;
default:
return contentHeight;
}