Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/pr/337' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Inferis committed Apr 21, 2013
2 parents 1c1a65f + deb756f commit 7347efb
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion ViewDeck/IIViewDeckController.m
Expand Up @@ -2448,7 +2448,8 @@ - (void)panned:(UIPanGestureRecognizer*)panner orientation:(IIViewDeckOffsetOrie
// swipe to the right

// Animation duration based on velocity
CGFloat pointsToAnimate = fabsf(self.leftSize - self.slidingControllerView.frame.origin.x);
CGFloat maxDistance = CGRectGetWidth(self.view.frame) - self.leftSize;
CGFloat pointsToAnimate = fabsf(maxDistance - self.slidingControllerView.frame.origin.x);
NSTimeInterval animationDuration = durationToAnimate(pointsToAnimate, orientationVelocity);

if (v > 0) {
Expand Down

0 comments on commit 7347efb

Please sign in to comment.