summaryrefslogtreecommitdiff
path: root/platform/ios/src/MGLMapView.mm
diff options
context:
space:
mode:
authorNadia Barbosa <nadiabarbosa@me.com>2018-11-13 14:08:01 -0800
committerNadia Barbosa <captainbarbosa@users.noreply.github.com>2018-11-19 12:48:22 -0800
commit569dc0d78548d79a770f205000f4c25c4a9e1798 (patch)
tree688f6dd62cff00ded9febec74522c8a21c3e0d46 /platform/ios/src/MGLMapView.mm
parent8077055b1ad5bb7324b81c9b199176124240237b (diff)
downloadqtlocation-mapboxgl-569dc0d78548d79a770f205000f4c25c4a9e1798.tar.gz
[ios] Don't pause camera animations when zoom/pitch/rotate/scroll are disabled
[ios] Move up code [ios] Changelog newline
Diffstat (limited to 'platform/ios/src/MGLMapView.mm')
-rw-r--r--platform/ios/src/MGLMapView.mm6
1 files changed, 6 insertions, 0 deletions
diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm
index 4880a63cb9..6a3ab4da68 100644
--- a/platform/ios/src/MGLMapView.mm
+++ b/platform/ios/src/MGLMapView.mm
@@ -1380,11 +1380,17 @@ public:
- (void)touchesBegan:(__unused NSSet<UITouch *> *)touches withEvent:(__unused UIEvent *)event
{
+ if (!self.zoomEnabled && !self.pitchEnabled && !self.rotateEnabled && !self.scrollEnabled)
+ {
+ return;
+ };
+
_mbglMap->setGestureInProgress(false);
if (self.userTrackingState == MGLUserTrackingStateBegan)
{
[self setUserTrackingMode:MGLUserTrackingModeNone animated:NO];
}
+
[self cancelTransitions];
}