From 4fcd5c1ff4c3a84921fa97715a68f870a2ab857b Mon Sep 17 00:00:00 2001 From: Paul Gardiner Date: Mon, 4 Feb 2013 16:40:58 +0000 Subject: Android: alter zoom range for reflow mode --- android/src/com/artifex/mupdfdemo/ReaderView.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'android') diff --git a/android/src/com/artifex/mupdfdemo/ReaderView.java b/android/src/com/artifex/mupdfdemo/ReaderView.java index f16b39b3..11f33bb4 100644 --- a/android/src/com/artifex/mupdfdemo/ReaderView.java +++ b/android/src/com/artifex/mupdfdemo/ReaderView.java @@ -32,6 +32,7 @@ public class ReaderView extends AdapterView private static final float MIN_SCALE = 1.0f; private static final float MAX_SCALE = 5.0f; + private static final float REFLOW_SCALE_FACTOR = 0.5f; private Adapter mAdapter; private int mCurrent; // Adapter's index for the current view @@ -424,7 +425,10 @@ public class ReaderView extends AdapterView public boolean onScale(ScaleGestureDetector detector) { float previousScale = mScale; - mScale = Math.min(Math.max(mScale * detector.getScaleFactor(), MIN_SCALE), MAX_SCALE); + float scale_factor = mReflow ? REFLOW_SCALE_FACTOR : 1.0f; + float min_scale = MIN_SCALE * scale_factor; + float max_scale = MAX_SCALE * scale_factor; + mScale = Math.min(Math.max(mScale * detector.getScaleFactor(), min_scale), max_scale); if (mReflow) { applyToChildren(new ViewMapper() { -- cgit v1.2.3