Fixed issue concerning scrolling in ListView.

PhilJay · PhilJay · commit 40eee503485e · 2014-10-01T23:54:00.000+02:00
diff --git a/MPChartExample/AndroidManifest.xml b/MPChartExample/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.xxmassdeveloper.mpchartexample"
-    android:versionCode="22"
-    android:versionName="1.6.2" >
+    android:versionCode="23"
+    android:versionName="1.6.3" >
 
     <uses-sdk
         android:minSdkVersion="8"
diff --git a/MPChartExample/build.gradle b/MPChartExample/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId 'com.xxmassdeveloper.mpchartexample'
         minSdkVersion 16
         targetSdkVersion 19
-        versionCode 22
-        versionName '1.6.2'
+        versionCode 23
+        versionName '1.6.3'
 
         sourceSets {
             main {
diff --git a/MPChartExample/libs/mpandroidchartlibrary-1-6-3.jar b/MPChartExample/libs/mpandroidchartlibrary-1-6-3.jar
diff --git a/MPChartLib/src/com/github/mikephil/charting/listener/BarLineChartTouchListener.java b/MPChartLib/src/com/github/mikephil/charting/listener/BarLineChartTouchListener.java
@@ -91,7 +91,7 @@ public boolean onTouch(View v, MotionEvent event) {
             case MotionEvent.ACTION_POINTER_DOWN:
 
                 if (event.getPointerCount() >= 2) {
-                    
+
                     mChart.disableScroll();
 
                     saveTouchStart(event);
@@ -122,21 +122,23 @@ public boolean onTouch(View v, MotionEvent event) {
                 }
                 break;
             case MotionEvent.ACTION_MOVE:
-                
-                mChart.disableScroll();
 
                 if (mTouchMode == DRAG) {
 
+                    mChart.disableScroll();
+
                     performDrag(event);
 
                 } else if (mTouchMode == X_ZOOM || mTouchMode == Y_ZOOM || mTouchMode == PINCH_ZOOM) {
+ 
+                    mChart.disableScroll();
 
                     performZoom(event);
 
                 } else if (((mTouchMode == NONE) || (mTouchMode != DRAG && event
                         .getPointerCount() == 3))
                         && Math.abs(distance(event.getX(), mTouchStartPoint.x, event.getY(),
-                                mTouchStartPoint.y)) > 25f)  {
+                                mTouchStartPoint.y)) > 25f) {
 
                     mTouchMode = DRAG;
                 }
@@ -179,7 +181,7 @@ private void saveTouchStart(MotionEvent event) {
      * @param event
      */
     private void performDrag(MotionEvent event) {
-        
+
         mMatrix.set(mSavedMatrix);
         PointF dragPoint = new PointF(event.getX(), event.getY());
 
@@ -199,9 +201,9 @@ private void performDrag(MotionEvent event) {
      * @param event
      */
     private void performZoom(MotionEvent event) {
-        
-        if(event.getPointerCount() >= 2) {
-         
+
+        if (event.getPointerCount() >= 2) {
+
             // get the distance between the pointers of the touch
             // event
             float totalDist = spacing(event);
