summaryrefslogtreecommitdiff
path: root/org.fox.ttcomics/src/main/java/it/sephiroth/android/library/imagezoom/ImageViewTouchBase.java
diff options
context:
space:
mode:
Diffstat (limited to 'org.fox.ttcomics/src/main/java/it/sephiroth/android/library/imagezoom/ImageViewTouchBase.java')
-rwxr-xr-xorg.fox.ttcomics/src/main/java/it/sephiroth/android/library/imagezoom/ImageViewTouchBase.java27
1 files changed, 15 insertions, 12 deletions
diff --git a/org.fox.ttcomics/src/main/java/it/sephiroth/android/library/imagezoom/ImageViewTouchBase.java b/org.fox.ttcomics/src/main/java/it/sephiroth/android/library/imagezoom/ImageViewTouchBase.java
index a8b3038..8ba5b28 100755
--- a/org.fox.ttcomics/src/main/java/it/sephiroth/android/library/imagezoom/ImageViewTouchBase.java
+++ b/org.fox.ttcomics/src/main/java/it/sephiroth/android/library/imagezoom/ImageViewTouchBase.java
@@ -1,9 +1,5 @@
package it.sephiroth.android.library.imagezoom;
-import it.sephiroth.android.library.imagezoom.easing.Cubic;
-import it.sephiroth.android.library.imagezoom.easing.Easing;
-import it.sephiroth.android.library.imagezoom.graphics.FastBitmapDrawable;
-import it.sephiroth.android.library.imagezoom.utils.IDisposable;
import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.Matrix;
@@ -14,6 +10,11 @@ import android.util.AttributeSet;
import android.util.Log;
import android.widget.ImageView;
+import it.sephiroth.android.library.imagezoom.easing.Cubic;
+import it.sephiroth.android.library.imagezoom.easing.Easing;
+import it.sephiroth.android.library.imagezoom.graphics.FastBitmapDrawable;
+import it.sephiroth.android.library.imagezoom.utils.IDisposable;
+
/**
* Base View to manage image zoom/scrool/pinch operations
*
@@ -25,7 +26,7 @@ public class ImageViewTouchBase extends ImageView implements IDisposable {
public interface OnBitmapChangedListener {
void onBitmapChanged( Drawable drawable );
- };
+ }
public static final String LOG_TAG = "image";
@@ -95,13 +96,15 @@ public class ImageViewTouchBase extends ImageView implements IDisposable {
r.run();
}
if ( getDrawable() != null ) {
- if ( mFitToScreen )
- getProperBaseMatrix2( getDrawable(), mBaseMatrix );
- else
- getProperBaseMatrix( getDrawable(), mBaseMatrix );
- setImageMatrix( getImageViewMatrix() );
-
- if (mFitToWidth) zoomToWidth();
+ if (mFitToWidth) {
+ zoomToWidth();
+ } else {
+ if (mFitToScreen)
+ getProperBaseMatrix2(getDrawable(), mBaseMatrix);
+ else
+ getProperBaseMatrix(getDrawable(), mBaseMatrix);
+ setImageMatrix(getImageViewMatrix());
+ }
}
}