Changed calculation for min scale.

yuzhijun · Sep 8, 2016 · a2a8669 · a2a8669
1 parent d281009
commit a2a8669
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/ucrop/src/main/java/com/yalantis/ucrop/view/CropImageView.java b/ucrop/src/main/java/com/yalantis/ucrop/view/CropImageView.java
@@ -10,6 +10,7 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.util.AttributeSet;
+import android.util.Log;
 
 import com.yalantis.ucrop.R;
 import com.yalantis.ucrop.callback.BitmapCropCallback;
@@ -461,10 +462,11 @@ private void calculateImageScaleBounds() {
      * @param drawableHeight - image height
      */
     private void calculateImageScaleBounds(float drawableWidth, float drawableHeight) {
-        float widthScale = mCropRect.width() / drawableWidth;
-        float heightScale = mCropRect.height() / drawableHeight;
+        float widthScale = Math.min(mCropRect.width() / drawableWidth, mCropRect.width() / drawableHeight);
+        float heightScale = Math.min(mCropRect.height() / drawableHeight, mCropRect.height() / drawableWidth);
 
-        mMinScale = Math.max(widthScale, heightScale);
+        mMinScale = Math.min(widthScale, heightScale);
+        Log.d("WTF", "MIN SCALE : " + mMinScale);
         mMaxScale = mMinScale * mMaxScaleMultiplier;
     }