diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2020-02-06 18:03:17 +0100 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2020-02-11 09:12:30 +0100 |
| commit | 2838338a1c004f95ec71dd8723c7c426541ad9c8 (patch) | |
| tree | 335cba05de58c18326b7c86929e10e3e5659cec9 | |
| parent | bcfb81f35cbe622993bfa76263c8e059b2d0f8b6 (diff) | |
| download | mullvadvpn-2838338a1c004f95ec71dd8723c7c426541ad9c8.tar.xz mullvadvpn-2838338a1c004f95ec71dd8723c7c426541ad9c8.zip | |
Swap high and low zoom levels to make high indicate more zoom
| -rw-r--r-- | gui/src/renderer/components/Connect.tsx | 4 | ||||
| -rw-r--r-- | gui/src/renderer/components/Map.tsx | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/gui/src/renderer/components/Connect.tsx b/gui/src/renderer/components/Connect.tsx index 2308a91dff..4cdf0c75a9 100644 --- a/gui/src/renderer/components/Connect.tsx +++ b/gui/src/renderer/components/Connect.tsx @@ -237,7 +237,7 @@ export default class Connect extends Component<IProps, IState> { showMarker: this.showMarkerOrSpinner() === 'marker', markerStyle: this.getMarkerStyle(), // zoom in when connected - zoomLevel: state === 'connected' ? ZoomLevel.low : ZoomLevel.medium, + zoomLevel: state === 'connected' ? ZoomLevel.high : ZoomLevel.medium, // a magic offset to align marker with spinner offset: [0, 123], }; @@ -247,7 +247,7 @@ export default class Connect extends Component<IProps, IState> { showMarker: false, markerStyle: MarkerStyle.unsecure, // show the world when user location is not known - zoomLevel: ZoomLevel.high, + zoomLevel: ZoomLevel.low, // remove the offset since the marker is hidden offset: [0, 0], }; diff --git a/gui/src/renderer/components/Map.tsx b/gui/src/renderer/components/Map.tsx index 6b71e97459..c22085c8be 100644 --- a/gui/src/renderer/components/Map.tsx +++ b/gui/src/renderer/components/Map.tsx @@ -3,6 +3,7 @@ import { Component, Types, View } from 'reactxp'; import SvgMap from './SvgMap'; +// Higher zoom level is more zoomed in export enum ZoomLevel { high, medium, @@ -87,11 +88,11 @@ export default class Map extends Component<IProps, IState> { // TODO: Zoomlevels below 2.22 makes australia invisible private zoomLevel(variant: ZoomLevel) { switch (variant) { - case ZoomLevel.high: + case ZoomLevel.low: return 1; case ZoomLevel.medium: return 2.22; - case ZoomLevel.low: + case ZoomLevel.high: return 5; } } |
