fixed shaky zoom bug

vladexologija · Sep 19, 2011 · c357c0d · c357c0d
1 parent e80a46b
commit c357c0d
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 20 deletions.
diff --git a/README~ b/README~
diff --git a/bin/TouchImageView.apk b/bin/TouchImageView.apk
diff --git a/bin/classes.dex b/bin/classes.dex
diff --git a/bin/com/example/touch/TouchImageView$1.class b/bin/com/example/touch/TouchImageView$1.class
diff --git a/bin/com/example/touch/TouchImageView$ScaleListener.class b/bin/com/example/touch/TouchImageView$ScaleListener.class
diff --git a/bin/com/example/touch/TouchImageView.class b/bin/com/example/touch/TouchImageView.class
diff --git a/src/com/example/touch/TouchImageView.java b/src/com/example/touch/TouchImageView.java
@@ -39,7 +39,6 @@ public class TouchImageView extends ImageView {
     static final int CLICK = 3;
     float saveScale = 1f;
     float right, bottom, origWidth, origHeight, bmWidth, bmHeight;
-    boolean snapEquilibrium = false;
 
     ScaleGestureDetector mScaleDetector;
 
@@ -117,7 +116,6 @@ else if (y + deltaY < -bottom)
 
 	            	case MotionEvent.ACTION_POINTER_UP:
 	            		mode = NONE;
-	            		snapEquilibrium = false;
 	            		break;
             	}
                 setImageMatrix(matrix);
@@ -162,23 +160,6 @@ public boolean onScale(ScaleGestureDetector detector) {
         	right = width * saveScale - width - (2 * redundantXSpace * saveScale);
             bottom = height * saveScale - height - (2 * redundantYSpace * saveScale);
         	if (origWidth * saveScale <= width || origHeight * saveScale <= height) {
-        		if (snapEquilibrium) {
-        			matrix.getValues(m);
-        			float x = m[Matrix.MTRANS_X];
-                	float y = m[Matrix.MTRANS_Y];
-        			if (origScale * origWidth > width && saveScale * origWidth <= width) {
-        				saveScale = width / origWidth;
-        				mScaleFactor = saveScale / origScale;
-        				matrix.postTranslate(-x, 0);
-        			} else {
-        				saveScale = height / origHeight;
-        				mScaleFactor = saveScale / origScale;
-        				matrix.postTranslate(0, -y);
-        			}
-        			matrix.postScale(mScaleFactor, mScaleFactor, detector.getFocusX(), detector.getFocusY());
-        			snapEquilibrium = false;
-        			return true;
-        		}
         		matrix.postScale(mScaleFactor, mScaleFactor, width / 2, height / 2);
             	if (mScaleFactor < 1) {
             		matrix.getValues(m);
@@ -199,7 +180,6 @@ else if (x > 0)
                 	}
             	}
         	} else {
-        		snapEquilibrium = true;
             	matrix.postScale(mScaleFactor, mScaleFactor, detector.getFocusX(), detector.getFocusY());
             	matrix.getValues(m);
             	float x = m[Matrix.MTRANS_X];