From f3d4e3e31c488e5ded0a457308c746913aecef8c Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 17 Oct 2012 16:52:06 +0400 Subject: call onScaleListener from the correct place --- .../android/library/imagezoom/ImageViewTouch.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'src/it/sephiroth/android/library') diff --git a/src/it/sephiroth/android/library/imagezoom/ImageViewTouch.java b/src/it/sephiroth/android/library/imagezoom/ImageViewTouch.java index f958bb9..c189cf8 100644 --- a/src/it/sephiroth/android/library/imagezoom/ImageViewTouch.java +++ b/src/it/sephiroth/android/library/imagezoom/ImageViewTouch.java @@ -112,13 +112,6 @@ public class ImageViewTouch extends ImageViewTouchBase { } break; } - if (mScaleChangedListener != null) { - RectF bitmapRect = getBitmapRect(); - - boolean widthFits = getWidth() >= (bitmapRect.right - bitmapRect.left); - - mScaleChangedListener.onScaleChanged(mCurrentScaleFactor, widthFits); - } return true; } @@ -126,6 +119,14 @@ public class ImageViewTouch extends ImageViewTouchBase { protected void onZoom( float scale ) { super.onZoom( scale ); if ( !mScaleDetector.isInProgress() ) mCurrentScaleFactor = scale; + + if (mScaleChangedListener != null) { + RectF bitmapRect = getBitmapRect(); + + boolean widthFits = getWidth() >= (bitmapRect.right - bitmapRect.left); + + mScaleChangedListener.onScaleChanged(mCurrentScaleFactor, widthFits); + } } protected float onDoubleTapPost( float scale, float maxZoom ) { -- cgit v1.2.3