Skip to content

Takes section right inset into account when calculating cells position #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Takes section right inset into account when calculating cells position #5

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8fca272
Takes collection view right content inset into account when calculati…
HeshamMegid Dec 24, 2014
5f77319
Fixes warning about modifying layout attributes without copying them.
HeshamMegid Sep 1, 2015
3969d81
Merge branch 'master' of https://github.com/mokagio/UICollectionViewR…
HeshamMegid Apr 24, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions UICollectionViewRightAlignedLayout/UICollectionViewRightAlignedLayout.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,16 @@

@interface UICollectionViewLayoutAttributes (RightAligned)

- (void)rightAlignFrameOnWidth:(CGFloat)width;
- (void)rightAlignFrameOnWidth:(CGFloat)width withSectionInset:(UIEdgeInsets)sectionInset;

@end

@implementation UICollectionViewLayoutAttributes (RightAligned)

- (void)rightAlignFrameOnWidth:(CGFloat)width
- (void)rightAlignFrameOnWidth:(CGFloat)width withSectionInset:(UIEdgeInsets)sectionInset
{
CGRect frame = self.frame;
frame.origin.x = width - frame.size.width;
frame.origin.x = width - frame.size.width - sectionInset.right;
self.frame = frame;
}

Expand Down Expand Up @@ -59,12 +59,12 @@ - (UICollectionViewLayoutAttributes *)layoutAttributesForItemAtIndexPath:(NSInde
UICollectionViewLayoutAttributes* currentItemAttributes = [[super layoutAttributesForItemAtIndexPath:indexPath] copy];

BOOL isFirstItemInSection = indexPath.item == 0;

if (isFirstItemInSection) {
[currentItemAttributes rightAlignFrameOnWidth:self.collectionView.frame.size.width];
[currentItemAttributes rightAlignFrameOnWidth:self.collectionView.frame.size.width withSectionInset:self.sectionInset];
return currentItemAttributes;
}

NSIndexPath* previousIndexPath = [NSIndexPath indexPathForItem:indexPath.item-1 inSection:indexPath.section];
CGRect previousFrame = [self layoutAttributesForItemAtIndexPath:previousIndexPath].frame;
CGRect currentFrame = currentItemAttributes.frame;
Expand All @@ -75,12 +75,12 @@ - (UICollectionViewLayoutAttributes *)layoutAttributesForItemAtIndexPath:(NSInde
// if the current frame, once left aligned to the left and stretched to the full collection view
// widht intersects the previous frame then they are on the same line
BOOL isFirstItemInRow = !CGRectIntersectsRect(previousFrame, strecthedCurrentFrame);

if (isFirstItemInRow) {
[currentItemAttributes rightAlignFrameOnWidth:self.collectionView.frame.size.width];
[currentItemAttributes rightAlignFrameOnWidth:self.collectionView.frame.size.width withSectionInset:self.sectionInset];
return currentItemAttributes;
}

CGFloat previousFrameLeftPoint = previousFrame.origin.x;
CGRect frame = currentItemAttributes.frame;
CGFloat minimumInteritemSpacing = [self evaluatedMinimumInteritemSpacingForItemAtIndex:indexPath.row];
Expand All @@ -93,7 +93,7 @@ - (CGFloat)evaluatedMinimumInteritemSpacingForItemAtIndex:(NSInteger)index
{
if ([self.collectionView.delegate respondsToSelector:@selector(collectionView:layout:minimumInteritemSpacingForSectionAtIndex:)]) {
id<UICollectionViewDelegateRightAlignedLayout> delegate = (id<UICollectionViewDelegateRightAlignedLayout>)self.collectionView.delegate;

return [delegate collectionView:self.collectionView layout:self minimumInteritemSpacingForSectionAtIndex:index];
} else {
return self.minimumInteritemSpacing;
Expand Down