summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Wray <jason@mapbox.com>2019-06-19 14:21:59 -0700
committerJason Wray <jason@mapbox.com>2019-06-19 14:21:59 -0700
commit555f3e04af473d7b3a3bcd6ce443d0c2e290c4ca (patch)
treea20aecad7e372dcb98edca597dd0ccb525cdd284
parent3f9fd46fd4e4c22fe0779c56b2f701e423f2d909 (diff)
downloadqtlocation-mapboxgl-555f3e04af473d7b3a3bcd6ce443d0c2e290c4ca.tar.gz
[ios] Require two fingers for duration of tilt gesture
-rw-r--r--platform/ios/CHANGELOG.md4
-rw-r--r--platform/ios/src/MGLMapView.mm2
2 files changed, 6 insertions, 0 deletions
diff --git a/platform/ios/CHANGELOG.md b/platform/ios/CHANGELOG.md
index d6583d277a..01d70385ac 100644
--- a/platform/ios/CHANGELOG.md
+++ b/platform/ios/CHANGELOG.md
@@ -2,6 +2,10 @@
Mapbox welcomes participation and contributions from everyone. Please read [CONTRIBUTING.md](../../CONTRIBUTING.md) to get started.
+## 5.2.0
+
+* Fixed an issue where the two-finger tilt gesture would continue after lifting one finger. ([#14969](https://github.com/mapbox/mapbox-gl-native/pull/14969))
+
## 5.1.0 - June 19, 2019
### Styles and rendering
diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm
index 85a2e3be92..8f34e80083 100644
--- a/platform/ios/src/MGLMapView.mm
+++ b/platform/ios/src/MGLMapView.mm
@@ -2049,6 +2049,8 @@ public:
{
if ( ! self.isPitchEnabled) return;
+ if (twoFingerDrag.numberOfTouches != 2) return;
+
[self cancelTransitions];
self.cameraChangeReasonBitmask |= MGLCameraChangeReasonGestureTilt;