diff options
| author | Łukasz Paczos <lukas.paczos@gmail.com> | 2019-08-21 18:15:38 +0200 |
|---|---|---|
| committer | Łukasz Paczos <lukasz.paczos@mapbox.com> | 2019-08-29 14:51:24 +0200 |
| commit | e5c219d0356d45a5339c027297e441fd6cb96c05 (patch) | |
| tree | 01eae9f8cc3e7293879a94a3fd04aab71b646da8 /src/mbgl/map/transform_state.cpp | |
| parent | 6a4e431dbef4c036b5b27b9972caea70bfc269fb (diff) | |
| download | qtlocation-mapboxgl-e5c219d0356d45a5339c027297e441fd6cb96c05.tar.gz | |
[core] make padding optional when camera position is requested.
When padding is not provided, the current one that's cached in the TransformState is going to be returned.
Diffstat (limited to 'src/mbgl/map/transform_state.cpp')
| -rw-r--r-- | src/mbgl/map/transform_state.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mbgl/map/transform_state.cpp b/src/mbgl/map/transform_state.cpp index 951c5a6202..61007422cb 100644 --- a/src/mbgl/map/transform_state.cpp +++ b/src/mbgl/map/transform_state.cpp @@ -146,10 +146,10 @@ ViewportMode TransformState::getViewportMode() const { #pragma mark - Camera options -CameraOptions TransformState::getCameraOptions(const EdgeInsets& padding) const { +CameraOptions TransformState::getCameraOptions(optional<EdgeInsets> padding) const { return CameraOptions() .withCenter(getLatLng()) - .withPadding(padding) + .withPadding(padding ? padding : edgeInsets) .withZoom(getZoom()) .withBearing(-bearing * util::RAD2DEG) .withPitch(pitch * util::RAD2DEG); |