Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed the animation of double tap zoom out when minScale > 1 #241

Merged
merged 1 commit into from
May 23, 2017
Merged

Fixed the animation of double tap zoom out when minScale > 1 #241

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions Classes/IDMZoomingScrollView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,13 +198,16 @@ - (void)setMaxMinZoomScalesForCurrentBounds {
// on high resolution screens we have double the pixel density, so we will be seeing every pixel if we limit the
// maximum zoom scale to 0.5.
if ([UIScreen instancesRespondToSelector:@selector(scale)]) {
maxDoubleTapZoomScale = maxDoubleTapZoomScale / [[UIScreen mainScreen] scale];

if (maxDoubleTapZoomScale < minScale) {
maxDoubleTapZoomScale = minScale * 2;
maxDoubleTapZoomScale = maxDoubleTapZoomScale / [[UIScreen mainScreen] scale];
if (maxDoubleTapZoomScale < minScale) {
maxDoubleTapZoomScale = minScale * 2;
}
}

// Make sure maxDoubleTapZoomScale isn't larger than maxScale
maxDoubleTapZoomScale = MIN(maxDoubleTapZoomScale, maxScale);

// Set
self.maximumZoomScale = maxScale;
self.minimumZoomScale = minScale;
Expand Down