summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Wray <friedbunny@users.noreply.github.com>2016-06-29 12:48:53 -0400
committerGitHub <noreply@github.com>2016-06-29 12:48:53 -0400
commit1a6b5137031d96dcbfb38d0e1a2289386502c7e4 (patch)
treef231c8aee72874ae9bb09258d950bd0804450fab
parentbf079a285fb3c2f618ae9672b79a926fca48efeb (diff)
downloadqtlocation-mapboxgl-1a6b5137031d96dcbfb38d0e1a2289386502c7e4.tar.gz
[ios] Fix conflict between view dragging gesture and quick zoom (#5506)
This stops the quick zoom gesture (double-tap and hold) from also triggering a drag, when performed on a draggable annotation view.
-rw-r--r--platform/ios/src/MGLAnnotationView.mm2
1 files changed, 1 insertions, 1 deletions
diff --git a/platform/ios/src/MGLAnnotationView.mm b/platform/ios/src/MGLAnnotationView.mm
index 7068cdc0db..3bbe2fcc84 100644
--- a/platform/ios/src/MGLAnnotationView.mm
+++ b/platform/ios/src/MGLAnnotationView.mm
@@ -238,7 +238,7 @@
- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer
{
- return YES;
+ return otherGestureRecognizer == _longPressRecognizer || otherGestureRecognizer == _panGestureRecognizer;
}
- (id<CAAction>)actionForLayer:(CALayer *)layer forKey:(NSString *)event