diff options
| author | Fabian Guerra Soto <fabian.guerra@mapbox.com> | 2019-06-03 07:32:20 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-03 07:32:20 -0700 |
| commit | 402645109f8d0535cac132d824d39f38a4f1c558 (patch) | |
| tree | 61969265c1e4c6bb9840d8f376260301d7e32556 /platform/ios/src/MGLMapView.mm | |
| parent | b2428835871933ecf5a93e86493bac0b76db0ede (diff) | |
| download | qtlocation-mapboxgl-402645109f8d0535cac132d824d39f38a4f1c558.tar.gz | |
[ios] Fix content insets with custom edge padding. (#14813)
* [ios] Fix content insets with custom edge padding.
* [ios, macos] Consolidated edge insets math
* [macos] Add content insets to edge padding when setting camera
* [ios, macos] Updated changelogs
* [ios, macos] Clarify setCamera:withDuration:animationTimingFunction:edgePadding method documentation.
Diffstat (limited to 'platform/ios/src/MGLMapView.mm')
| -rw-r--r-- | platform/ios/src/MGLMapView.mm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm index c2ab9c9fc1..077729d448 100644 --- a/platform/ios/src/MGLMapView.mm +++ b/platform/ios/src/MGLMapView.mm @@ -3557,7 +3557,7 @@ public: - (void)setCamera:(MGLMapCamera *)camera withDuration:(NSTimeInterval)duration animationTimingFunction:(nullable CAMediaTimingFunction *)function completionHandler:(nullable void (^)(void))completion { MGLLogDebug(@"Setting camera: %@ duration: %f animationTimingFunction: %@ completionHandler: %@", camera, duration, function, completion); - [self setCamera:camera withDuration:duration animationTimingFunction:function edgePadding:self.contentInset completionHandler:completion]; + [self setCamera:camera withDuration:duration animationTimingFunction:function edgePadding:UIEdgeInsetsZero completionHandler:completion]; } - (void)setCamera:(MGLMapCamera *)camera withDuration:(NSTimeInterval)duration animationTimingFunction:(nullable CAMediaTimingFunction *)function edgePadding:(UIEdgeInsets)edgePadding completionHandler:(nullable void (^)(void))completion { @@ -3571,6 +3571,8 @@ public: } MGLLogDebug(@"Setting camera: %@ duration: %f animationTimingFunction: %@ edgePadding: %@ completionHandler: %@", camera, duration, function, NSStringFromUIEdgeInsets(edgePadding), completion); + + edgePadding = MGLEdgeInsetsInsetEdgeInset(edgePadding, self.contentInset); mbgl::AnimationOptions animationOptions; if (duration > 0) |