Add minimum image output size property and implementation.

Arvkon · May 22, 2015 · e590f8a · e590f8a
1 parent a5709d2
commit e590f8a
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 1 deletion.
diff --git a/RSKImageCropper/RSKImageCropViewController.h b/RSKImageCropper/RSKImageCropViewController.h
@@ -150,6 +150,9 @@ typedef NS_ENUM(NSUInteger, RSKImageCropMode) {
  */
 @property (assign, getter=isRotationEnabled, nonatomic) BOOL rotationEnabled;
 
+// Added by https://github.com/Arvkon
+- (void)setMinOutputSize:(CGSize)minSize;
+
 /// -------------------------------
 /// @name Accessing the UI Elements
 /// -------------------------------

diff --git a/RSKImageCropper/RSKImageCropViewController.m b/RSKImageCropper/RSKImageCropViewController.m
@@ -431,6 +431,12 @@ - (void)setRotationAngle:(CGFloat)rotationAngle
     }
 }
 
+// Added by https://github.com/Arvkon
+- (void)setMinOutputSize:(CGSize)minSize
+{
+    self.imageScrollView.minOutputSize = minSize;
+}
+
 #pragma mark - Action handling
 
 - (void)onCancelButtonTouch:(UIBarButtonItem *)sender

diff --git a/RSKImageCropper/RSKImageScrollView.h b/RSKImageCropper/RSKImageScrollView.h
@@ -52,6 +52,9 @@
 @property (nonatomic, strong) UIImageView *zoomView;
 @property (nonatomic, assign) BOOL aspectFill;
 
+// Added by https://github.com/Arvkon
+@property (nonatomic, assign) CGSize minOutputSize;
+
 - (void)displayImage:(UIImage *)image;
 
 @end
diff --git a/RSKImageCropper/RSKImageScrollView.m b/RSKImageCropper/RSKImageScrollView.m
@@ -213,7 +213,14 @@ - (void)setMaxMinZoomScalesForCurrentBounds
     if (minScale > maxScale) {
         minScale = maxScale;
     }
-
+
+    // Added by https://github.com/Arvkon
+    if (boundsSize.width < boundsSize.height) {
+        maxScale = MIN(maxScale, boundsSize.width / self.minOutputSize.width);
+    } else {
+        maxScale = MIN(maxScale, boundsSize.height / self.minOutputSize.height);
+    }
+
     self.maximumZoomScale = maxScale;
     self.minimumZoomScale = minScale;
 }