diff options
-rw-r--r-- | AndroidManifest.xml | 2 | ||||
-rw-r--r-- | src/it/sephiroth/android/library/imagezoom/ImageViewTouch.java | 8 | ||||
-rw-r--r-- | src/org/fox/ttcomics/ComicFragment.java | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 451aa2d..2f0c51f 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,6 +1,6 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.fox.ttcomics"
- android:versionCode="13"
+ android:versionCode="14"
android:versionName="1.0.7" >
<uses-sdk
diff --git a/src/it/sephiroth/android/library/imagezoom/ImageViewTouch.java b/src/it/sephiroth/android/library/imagezoom/ImageViewTouch.java index 1dd873c..f958bb9 100644 --- a/src/it/sephiroth/android/library/imagezoom/ImageViewTouch.java +++ b/src/it/sephiroth/android/library/imagezoom/ImageViewTouch.java @@ -34,7 +34,7 @@ public class ImageViewTouch extends ImageViewTouchBase { private OnImageViewTouchDoubleTapListener doubleTapListener; public interface OnScaleChangedListener { - public void onScaleChanged(float scale); + public void onScaleChanged(float scale, boolean widthFits); } protected OnScaleChangedListener mScaleChangedListener; @@ -113,7 +113,11 @@ public class ImageViewTouch extends ImageViewTouchBase { break; } if (mScaleChangedListener != null) { - mScaleChangedListener.onScaleChanged(mCurrentScaleFactor); + RectF bitmapRect = getBitmapRect(); + + boolean widthFits = getWidth() >= (bitmapRect.right - bitmapRect.left); + + mScaleChangedListener.onScaleChanged(mCurrentScaleFactor, widthFits); } return true; } diff --git a/src/org/fox/ttcomics/ComicFragment.java b/src/org/fox/ttcomics/ComicFragment.java index 2221b3a..eb40627 100644 --- a/src/org/fox/ttcomics/ComicFragment.java +++ b/src/org/fox/ttcomics/ComicFragment.java @@ -86,11 +86,11 @@ public class ComicFragment extends Fragment { image.setImageBitmap(loadImage(pager.getArchive(), m_page));
image.setOnScaleChangedListener(new ImageViewTouch.OnScaleChangedListener() {
@Override
- public void onScaleChanged(float scale) {
+ public void onScaleChanged(float scale, boolean widthFits) {
ViewPager pager = (ViewPager) getActivity().findViewById(R.id.comics_pager);
if (pager != null) {
- pager.setPagingEnabled(scale - 1.0f < 0.01);
+ pager.setPagingEnabled(widthFits);
}
}
});
|