Skip to content

Fix image animation transition #192

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

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Fix image animation transition #192

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8e25af8
Fix image animation transition
djbe May 1, 2016
4b6705f
Merge branch 'develop' into fix-image-transition-animation
djbe Aug 26, 2016
eda4a21
Merge branch 'develop' into fix-image-transition-animation
djbe Feb 16, 2017
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
10 changes: 9 additions & 1 deletion NYTPhotoViewer/NYTPhotoTransitionAnimator.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,15 @@ - (void)performZoomingAnimationWithTransitionContext:(id <UIViewControllerContex

CGAffineTransform finalEndingViewTransform = self.endingView.transform;

CGFloat endingViewInitialTransform = CGRectGetHeight(startingViewForAnimation.frame) / CGRectGetHeight(endingViewForAnimation.frame);
CGFloat endingViewInitialTransform = 1;
switch (self.startingView.contentMode) {
case UIViewContentModeScaleAspectFill:
case UIViewContentModeScaleToFill:
endingViewInitialTransform = CGRectGetWidth(startingViewForAnimation.frame) / CGRectGetWidth(endingViewForAnimation.frame);
break;
default:
endingViewInitialTransform = CGRectGetHeight(startingViewForAnimation.frame) / CGRectGetHeight(endingViewForAnimation.frame);
}
CGPoint translatedStartingViewCenter = [[self class] centerPointForView:self.startingView
translatedToContainerView:containerView];

Expand Down