diff options
| author | Antonio Zugaldia <antonio@mapbox.com> | 2015-12-30 15:27:42 -0800 |
|---|---|---|
| committer | Antonio Zugaldia <antonio@mapbox.com> | 2015-12-30 15:27:58 -0800 |
| commit | 6e4eb094bf2feb9be4f5d2d73b1186aed768539b (patch) | |
| tree | 37987cea80178cf27a66a8ebf179d6c748ce3328 | |
| parent | e6dc4fe49d9e6ce59d4a888b82460a9ec89e3449 (diff) | |
| download | qtlocation-mapboxgl-6e4eb094bf2feb9be4f5d2d73b1186aed768539b.tar.gz | |
[android] Fix zoom gestures when scrolling is disabled
Fixes #3421
| -rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java index 392b26ed8f..d3b356fd62 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java @@ -3123,7 +3123,7 @@ public final class MapView extends FrameLayout { mQuickZoom = !mTwoTap; // Scale the map - if (!mQuickZoom && mUserLocationView.getMyLocationTrackingMode() == MyLocationTracking.TRACKING_NONE) { + if (mScrollEnabled && !mQuickZoom && mUserLocationView.getMyLocationTrackingMode() == MyLocationTracking.TRACKING_NONE) { // around gesture mNativeMapView.scaleBy(detector.getScaleFactor(), detector.getFocusX() / mScreenDensity, detector.getFocusY() / mScreenDensity); } else { |