Merge branch 'master' of github.com:RobotsAndPencils/RPSlidingMenu

RobotsAndPencils · Apr 14, 2014 · 75a42e3 · 75a42e3
2 parents ca6be51 + 92e40f7
commit 75a42e3
Showing 1 changed file with 6 additions and 13 deletions.
diff --git a/RPSlidingMenu/RPSlidingMenuLayout.m b/RPSlidingMenu/RPSlidingMenuLayout.m
@@ -141,20 +141,13 @@ - (NSArray *)layoutAttributesForElementsInRect:(CGRect)rect {
     return attributesInRect;
 }
 
-- (CGPoint)targetContentOffsetForProposedContentOffset:(CGPoint)proposedContentOffset withScrollingVelocity:(CGPoint)velocity {
 
-    // so when a person stops dragging/flicking - we use the drag interval to determine where it will snap to
-    CGFloat currentY = self.collectionView.contentOffset.y;
-    // the marker of the next drag/page intervals
-    CGFloat lastPageY =   (NSInteger)(currentY /  RPSlidingCellDragInterval) * RPSlidingCellDragInterval;
-    CGFloat nextPageY =   lastPageY + RPSlidingCellDragInterval;
-
-    // snap to whichever is closest
-    if (velocity.y > 0) {
-        return CGPointMake(self.collectionView.contentOffset.x, nextPageY);
-    } else {
-        return CGPointMake(self.collectionView.contentOffset.x, lastPageY);
-    }
+- (CGPoint)targetContentOffsetForProposedContentOffset:(CGPoint)proposedContentOffset withScrollingVelocity:(CGPoint)velocity {
+
+    CGFloat proposedPageIndex = roundf(proposedContentOffset.y / RPSlidingCellDragInterval);
+    CGFloat nearestPageOffset = proposedPageIndex * RPSlidingCellDragInterval;
+
+    return CGPointMake(0.0f, nearestPageOffset);
 }
 
 - (UICollectionViewLayoutAttributes *)layoutAttributesForItemAtIndexPath:(NSIndexPath *)indexPath {