From a5856e67eeeff86b856af52add4274d1e3591859 Mon Sep 17 00:00:00 2001
From: seven332 <seven332@163.com>
Date: Tue, 23 Feb 2016 14:16:25 +0800
Subject: [PATCH] Adjust ImageView scaleDefault

---
 .../hippo/ehviewer/gallery/gl/ImageView.java  | 24 +++++++++----------
 .../gallery/gl/PagerLayoutManager.java        |  2 +-
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/gallery/gl/ImageView.java b/app/src/main/java/com/hippo/ehviewer/gallery/gl/ImageView.java
index ed2ac92dc..ee95bc69e 100644
--- a/app/src/main/java/com/hippo/ehviewer/gallery/gl/ImageView.java
+++ b/app/src/main/java/com/hippo/ehviewer/gallery/gl/ImageView.java
@@ -60,10 +60,10 @@ public class ImageView extends GLView {
     private int mTextureWidth;
     private int mTextureHeight;
 
-    private RectF mDst = new RectF();
-    private RectF mSrcActual = new RectF();
-    private RectF mDstActual = new RectF();
-    private Rect mValidRect = new Rect();
+    private final RectF mDst = new RectF();
+    private final RectF mSrcActual = new RectF();
+    private final RectF mDstActual = new RectF();
+    private final Rect mValidRect = new Rect();
 
     private int mScaleMode = SCALE_FIT;
     private int mStartPosition = START_POSITION_TOP_RIGHT;
@@ -142,16 +142,14 @@ public class ImageView extends GLView {
         }
 
         scaleDefault[0] = 1.0f;
+        scaleDefault[1] = (float) getWidth() / mTextureWidth;
+        scaleDefault[2] = (float) getHeight() / mTextureHeight;
+        scaleDefault[3] = Math.max(scaleDefault[1], scaleDefault[2]) * 2;
 
-        float scaleX = (float) getWidth() / mTextureWidth;
-        float scaleY = (float) getHeight() / mTextureHeight;
-        if (scaleX < scaleY) {
-            scaleDefault[1] = scaleX;
-        } else {
-            scaleDefault[1] = scaleY;
-        }
-
-        scaleDefault[2] = scaleDefault[1] * 1.5f;
+        scaleDefault[0] = MathUtils.clamp(scaleDefault[0], SCALE_MIN, SCALE_MAX);
+        scaleDefault[1] = MathUtils.clamp(scaleDefault[1], SCALE_MIN, SCALE_MAX);
+        scaleDefault[2] = MathUtils.clamp(scaleDefault[2], SCALE_MIN, SCALE_MAX);
+        scaleDefault[3] = MathUtils.clamp(scaleDefault[3], SCALE_MIN, SCALE_MAX);
 
         Arrays.sort(scaleDefault);
     }
diff --git a/app/src/main/java/com/hippo/ehviewer/gallery/gl/PagerLayoutManager.java b/app/src/main/java/com/hippo/ehviewer/gallery/gl/PagerLayoutManager.java
index 4d6b5503f..3d65cd46b 100644
--- a/app/src/main/java/com/hippo/ehviewer/gallery/gl/PagerLayoutManager.java
+++ b/app/src/main/java/com/hippo/ehviewer/gallery/gl/PagerLayoutManager.java
@@ -77,7 +77,7 @@ public class PagerLayoutManager extends GalleryView.LayoutManager {
     private final int mInterval;
 
     private final int[] mScrollRemain = new int[2];
-    private final float[] mScaleDefault = new float[3];
+    private final float[] mScaleDefault = new float[4];
 
     private final PageFling mPageFling;
     private final SmoothScroller mSmoothScroller;