diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2023-01-10 10:11:57 +0100 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2023-01-10 10:11:57 +0100 |
| commit | 197ad90a78226203ae188dfdfd84f063a1ea51ae (patch) | |
| tree | bb4534869fdf3e64638617c2a61415c262ef7fa6 | |
| parent | 17c36c1a83fa263c634b2abf37c6007481df0139 (diff) | |
| parent | f844066056eeb5ee1b9f650c1928f996645df5ab (diff) | |
| download | mullvadvpn-197ad90a78226203ae188dfdfd84f063a1ea51ae.tar.xz mullvadvpn-197ad90a78226203ae188dfdfd84f063a1ea51ae.zip | |
Merge branch 'fix-content-height'
| -rw-r--r-- | gui/src/main/window-controller.ts | 5 | ||||
| -rw-r--r-- | gui/src/renderer/components/TunnelControl.tsx | 2 |
2 files changed, 2 insertions, 5 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; } diff --git a/gui/src/renderer/components/TunnelControl.tsx b/gui/src/renderer/components/TunnelControl.tsx index a2944b0fee..0d11762d38 100644 --- a/gui/src/renderer/components/TunnelControl.tsx +++ b/gui/src/renderer/components/TunnelControl.tsx @@ -34,7 +34,7 @@ const Body = styled.div({ display: 'flex', flexDirection: 'column', padding: `0 ${measurements.viewMargin}`, - minHeight: '170px', + minHeight: '185px', }); const Wrapper = styled.div({ |