From 5a671a302294516b2506859c25bb42da05cfd9d3 Mon Sep 17 00:00:00 2001 From: Michael Henry Pantaleon Date: Sat, 21 Dec 2019 20:47:19 +0900 Subject: [PATCH] close #84 --- Sources/ImageViewerController.swift | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Sources/ImageViewerController.swift b/Sources/ImageViewerController.swift index 948aea83..e066fd0b 100644 --- a/Sources/ImageViewerController.swift +++ b/Sources/ImageViewerController.swift @@ -218,10 +218,12 @@ class ImageViewerController:UIViewController, UIGestureRecognizerDelegate { extension ImageViewerController { func updateMinMaxZoomScaleForSize(_ size: CGSize) { - let widthScale = (size.width + 1.0) / imageView.bounds.width - let heightScale = (size.height + 1.0) / imageView.bounds.height - let minScale = min(widthScale, heightScale) - let maxScale = max(widthScale, heightScale) + let minScale = min( + size.width/imageView.bounds.width, + size.height/imageView.bounds.height) + let maxScale = max( + (size.width + 1.0) / imageView.bounds.width, + (size.height + 1.0) / imageView.bounds.height) scrollView.minimumZoomScale = minScale scrollView.zoomScale = minScale