From b007e9b5af68578e1c99529e89cd7877dfd6ebdd Mon Sep 17 00:00:00 2001 From: Alexsandersky Date: Wed, 2 Mar 2016 11:22:23 +0400 Subject: [PATCH] new algorithm for maxScale in SKZoomingScrollView --- SKPhotoBrowser/SKZoomingScrollView.swift | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/SKPhotoBrowser/SKZoomingScrollView.swift b/SKPhotoBrowser/SKZoomingScrollView.swift index cd6ebd7..1ffbcdd 100644 --- a/SKPhotoBrowser/SKZoomingScrollView.swift +++ b/SKPhotoBrowser/SKZoomingScrollView.swift @@ -113,7 +113,20 @@ public class SKZoomingScrollView: UIScrollView, UIScrollViewDelegate, SKDetectin let xScale = boundsSize.width / imageSize.width let yScale = boundsSize.height / imageSize.height let minScale: CGFloat = min(xScale, yScale) - var maxScale: CGFloat = 1.0 + var maxScale: CGFloat! + + let deviceScreenWidth = UIScreen.mainScreen().bounds.width + + if photoImageView.frame.width < deviceScreenWidth { + if deviceScreenWidth / 2 > photoImageView.frame.width { + maxScale = 3.0 + } else { + maxScale = 2.0 + } + } else { + maxScale = 1.0 + } + maximumZoomScale = maxScale minimumZoomScale = minScale