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

Address comments from @levi

Browse Source
This commit is contained in:
Michael Schneider
2016-06-24 10:15:04 -07:00
parent 9fb3129a0e
commit 30bb2ee93d
4 changed files with 58 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
AsyncDisplayKit/Details/ASCollectionViewFlowLayoutInspector.m
View File

@@ -19,7 +19,7 @@
// Returns a constrained size to let the cells layout itself as far as possible based on the scrollable direction
// of the collection view
static ASSizeRange ASDefaultConstrainedSizeForNodeForCollectionView(ASCollectionView *collectionView) {
static inline ASSizeRange NodeConstrainedSizeWithCollectionView(ASCollectionView *collectionView) {
CGSize maxSize = collectionView.bounds.size;
if (ASScrollDirectionContainsHorizontalDirection(collectionView.scrollableDirections)) {
maxSize.width = FLT_MAX;
@@ -29,9 +29,9 @@ static ASSizeRange ASDefaultConstrainedSizeForNodeForCollectionView(ASCollection
return ASSizeRangeMake(CGSizeZero, maxSize);
}
#pragma mark - ASCollectionViewDefaultCustomLayoutInspector
#pragma mark - ASCollectionViewLayoutInspector
@implementation ASCollectionViewDefaultCustomLayoutInspector {
@implementation ASCollectionViewLayoutInspector {
struct {
unsigned int implementsConstrainedSizeForNodeAtIndexPath:1;
} _dataSourceFlags;
@@ -65,7 +65,7 @@ static ASSizeRange ASDefaultConstrainedSizeForNodeForCollectionView(ASCollection
return [collectionView.asyncDataSource collectionView:collectionView constrainedSizeForNodeAtIndexPath:indexPath];
}
return ASDefaultConstrainedSizeForNodeForCollectionView(collectionView);
return NodeConstrainedSizeWithCollectionView(collectionView);
}
- (ASSizeRange)collectionView:(ASCollectionView *)collectionView constrainedSizeForSupplementaryNodeOfKind:(NSString *)kind atIndexPath:(NSIndexPath *)indexPath
@@ -152,11 +152,11 @@ static ASSizeRange ASDefaultConstrainedSizeForNodeForCollectionView(ASCollection
}
CGSize itemSize = _layout.itemSize;
if (!CGSizeEqualToSize(itemSize, kDefaultItemSize)) {
if (CGSizeEqualToSize(itemSize, kDefaultItemSize) == NO) {
return ASSizeRangeMake(itemSize, itemSize);
}
return ASDefaultConstrainedSizeForNodeForCollectionView(collectionView);
return NodeConstrainedSizeWithCollectionView(collectionView);
}
- (ASSizeRange)collectionView:(ASCollectionView *)collectionView constrainedSizeForSupplementaryNodeOfKind:(NSString *)kind atIndexPath:(NSIndexPath *)indexPath