From 9c0d0542dd4e73aa2b03e1f80d6d749c22e75d69 Mon Sep 17 00:00:00 2001 From: Scott Goodson Date: Mon, 7 Mar 2016 22:50:48 -0800 Subject: [PATCH] [ASScrollDirection] Fix scroll direction interpretation after recent changes to this logic. --- AsyncDisplayKit/ASCollectionView.mm | 8 ++++---- AsyncDisplayKit/ASTableView.mm | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/AsyncDisplayKit/ASCollectionView.mm b/AsyncDisplayKit/ASCollectionView.mm index fb6e47ff63..48621da9ae 100644 --- a/AsyncDisplayKit/ASCollectionView.mm +++ b/AsyncDisplayKit/ASCollectionView.mm @@ -598,16 +598,16 @@ static NSString * const kCellReuseIdentifier = @"_ASCollectionViewCell"; ASScrollDirection scrollableDirections = [self scrollableDirections]; if (ASScrollDirectionContainsHorizontalDirection(scrollableDirections)) { // Can scroll horizontally. - if (scrollVelocity.x > 0) { + if (scrollVelocity.x < 0.0) { direction |= ASScrollDirectionRight; - } else if (scrollVelocity.x < 0) { + } else if (scrollVelocity.x > 0.0) { direction |= ASScrollDirectionLeft; } } if (ASScrollDirectionContainsVerticalDirection(scrollableDirections)) { // Can scroll vertically. - if (scrollVelocity.y > 0) { + if (scrollVelocity.y < 0.0) { direction |= ASScrollDirectionDown; - } else if (scrollVelocity.y < 0) { + } else if (scrollVelocity.y > 0.0) { direction |= ASScrollDirectionUp; } } diff --git a/AsyncDisplayKit/ASTableView.mm b/AsyncDisplayKit/ASTableView.mm index 31647b4b21..ce53236dee 100644 --- a/AsyncDisplayKit/ASTableView.mm +++ b/AsyncDisplayKit/ASTableView.mm @@ -592,9 +592,9 @@ static NSString * const kCellReuseIdentifier = @"_ASTableViewCell"; - (ASScrollDirection)_scrollDirectionForVelocity:(CGPoint)velocity { ASScrollDirection direction = ASScrollDirectionNone; - if (velocity.y > 0) { + if (velocity.y < 0.0) { direction = ASScrollDirectionDown; - } else if (velocity.y < 0) { + } else if (velocity.y > 0.0) { direction = ASScrollDirectionUp; } return direction;