ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-12 09:19:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

[AS(Table|Collection)View] make scrollDirection transform aware

Browse Source
This commit is contained in:
Samuel Hsiung 2016-01-28 15:35:16 -08:00
parent 8d9d5a0cc3
commit 39cd3afa0d
4 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AsyncDisplayKit/ASCollectionView.mm
View File

@ -524,7 +524,9 @@ static NSString * const kCellReuseIdentifier = @"_ASCollectionViewCell";
} else { } else {
scrollVelocity = _deceleratingVelocity; scrollVelocity = _deceleratingVelocity;
} }
return [self _scrollDirectionForVelocity:scrollVelocity];
ASScrollDirection scrollDirection = [self _scrollDirectionForVelocity:scrollVelocity];
return ASScrollDirectionApplyTransform(scrollDirection, self.transform);
} }
- (ASScrollDirection)_scrollDirectionForVelocity:(CGPoint)scrollVelocity - (ASScrollDirection)_scrollDirectionForVelocity:(CGPoint)scrollVelocity

3
AsyncDisplayKit/ASTableView.mm
View File

@ -571,7 +571,8 @@ static NSString * const kCellReuseIdentifier = @"_ASTableViewCell";
} else { } else {
scrollVelocity = _deceleratingVelocity; scrollVelocity = _deceleratingVelocity;
} }
return [self _scrollDirectionForVelocity:scrollVelocity]; ASScrollDirection scrollDirection = [self _scrollDirectionForVelocity:scrollVelocity];
return ASScrollDirectionApplyTransform(scrollDirection, self.transform);
} }
- (ASScrollDirection)_scrollDirectionForVelocity:(CGPoint)velocity - (ASScrollDirection)_scrollDirectionForVelocity:(CGPoint)velocity

3
AsyncDisplayKit/Details/ASScrollDirection.h
View File

@ -10,6 +10,8 @@
#import "ASBaseDefines.h" #import "ASBaseDefines.h"
#include <CoreGraphics/CGAffineTransform.h>
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
typedef NS_OPTIONS(NSInteger, ASScrollDirection) { typedef NS_OPTIONS(NSInteger, ASScrollDirection) {
@ -32,6 +34,7 @@ BOOL ASScrollDirectionContainsRight(ASScrollDirection scrollDirection);
BOOL ASScrollDirectionContainsLeft(ASScrollDirection scrollDirection); BOOL ASScrollDirectionContainsLeft(ASScrollDirection scrollDirection);
BOOL ASScrollDirectionContainsUp(ASScrollDirection scrollDirection); BOOL ASScrollDirectionContainsUp(ASScrollDirection scrollDirection);
BOOL ASScrollDirectionContainsDown(ASScrollDirection scrollDirection); BOOL ASScrollDirectionContainsDown(ASScrollDirection scrollDirection);
ASScrollDirection ASScrollDirectionApplyTransform(ASScrollDirection scrollDirection, CGAffineTransform transform);
ASDISPLAYNODE_EXTERN_C_END ASDISPLAYNODE_EXTERN_C_END

27
AsyncDisplayKit/Details/ASScrollDirection.m
View File

@ -34,3 +34,30 @@ BOOL ASScrollDirectionContainsUp(ASScrollDirection scrollDirection) {
BOOL ASScrollDirectionContainsDown(ASScrollDirection scrollDirection) { BOOL ASScrollDirectionContainsDown(ASScrollDirection scrollDirection) {
return (scrollDirection & ASScrollDirectionDown) != 0; return (scrollDirection & ASScrollDirectionDown) != 0;
} }
ASScrollDirection ASScrollDirectionInvertHorizontally(ASScrollDirection scrollDirection) {
if (scrollDirection == ASScrollDirectionRight) {
return ASScrollDirectionLeft;
} else if (scrollDirection == ASScrollDirectionLeft) {
return ASScrollDirectionRight;
}
return scrollDirection;
}
ASScrollDirection ASScrollDirectionInvertVertically(ASScrollDirection scrollDirection) {
if (scrollDirection == ASScrollDirectionUp) {
return ASScrollDirectionDown;
} else if (scrollDirection == ASScrollDirectionDown) {
return ASScrollDirectionUp;
}
return scrollDirection;
}
ASScrollDirection ASScrollDirectionApplyTransform(ASScrollDirection scrollDirection, CGAffineTransform transform) {
if ((transform.a < 0) && ASScrollDirectionContainsHorizontalDirection(scrollDirection)) {
return ASScrollDirectionInvertHorizontally(scrollDirection);
} else if ((transform.d < 0) && ASScrollDirectionContainsVerticalDirection(scrollDirection)) {
return ASScrollDirectionInvertVertically(scrollDirection);
}
return scrollDirection;
}