Merge pull request #100 from joshleibsly/develop

Fix for issue when layout is rotated
chiahsien · May 15, 2015 · 2731fe9 · 2731fe9
2 parents ba82094 + 523160b
commit 2731fe9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/CHTCollectionViewWaterfallLayout.m b/CHTCollectionViewWaterfallLayout.m
@@ -117,7 +117,7 @@ - (CGFloat)itemWidthInSectionAtIndex:(NSInteger)section {
   } else {
     sectionInset = self.sectionInset;
   }
-  CGFloat width = self.collectionView.frame.size.width - sectionInset.left - sectionInset.right;
+  CGFloat width = self.collectionView.bounds.size.width - sectionInset.left - sectionInset.right;
   NSInteger columnCount = [self columnCountForSection:section];
 
   CGFloat columnSpacing = self.minimumColumnSpacing;
@@ -259,7 +259,7 @@ - (void)prepareLayout {
       sectionInset = self.sectionInset;
     }
 
-    CGFloat width = self.collectionView.frame.size.width - sectionInset.left - sectionInset.right;
+    CGFloat width = self.collectionView.bounds.size.width - sectionInset.left - sectionInset.right;
     NSInteger columnCount = [self columnCountForSection:section];
     CGFloat itemWidth = CHTFloorCGFloat((width - (columnCount - 1) * columnSpacing) / columnCount);
 
@@ -286,7 +286,7 @@ - (void)prepareLayout {
       attributes = [UICollectionViewLayoutAttributes layoutAttributesForSupplementaryViewOfKind:CHTCollectionElementKindSectionHeader withIndexPath:[NSIndexPath indexPathForItem:0 inSection:section]];
       attributes.frame = CGRectMake(headerInset.left,
                                     top,
-                                    self.collectionView.frame.size.width - (headerInset.left + headerInset.right),
+                                    self.collectionView.bounds.size.width - (headerInset.left + headerInset.right),
                                     headerHeight);
 
       self.headersAttribute[@(section)] = attributes;
@@ -353,7 +353,7 @@ - (void)prepareLayout {
       attributes = [UICollectionViewLayoutAttributes layoutAttributesForSupplementaryViewOfKind:CHTCollectionElementKindSectionFooter withIndexPath:[NSIndexPath indexPathForItem:0 inSection:section]];
       attributes.frame = CGRectMake(footerInset.left,
                                     top,
-                                    self.collectionView.frame.size.width - (footerInset.left + footerInset.right),
+                                    self.collectionView.bounds.size.width - (footerInset.left + footerInset.right),
                                     footerHeight);
 
       self.footersAttribute[@(section)] = attributes;

diff --git a/CHTCollectionViewWaterfallLayout.swift b/CHTCollectionViewWaterfallLayout.swift
@@ -119,7 +119,7 @@ class CHTCollectionViewWaterfallLayout : UICollectionViewLayout{
         }else{
             insets = self.sectionInset
         }
-        let width:CGFloat = self.collectionView!.frame.size.width - sectionInset.left-sectionInset.right
+        let width:CGFloat = self.collectionView!.bounds.size.width - sectionInset.left-sectionInset.right
         let spaceColumCount:CGFloat = CGFloat(self.columnCount-1)
         return floor((width - (spaceColumCount*self.minimumColumnSpacing)) / CGFloat(self.columnCount))
     }
@@ -166,7 +166,7 @@ class CHTCollectionViewWaterfallLayout : UICollectionViewLayout{
                 sectionInsets = self.sectionInset
             }
 
-            let width = self.collectionView!.frame.size.width - sectionInset.left - sectionInset.right
+            let width = self.collectionView!.bounds.size.width - sectionInset.left - sectionInset.right
             let spaceColumCount = CGFloat(self.columnCount-1)
             let itemWidth = floor((width - (spaceColumCount*self.minimumColumnSpacing)) / CGFloat(self.columnCount))
 
@@ -182,7 +182,7 @@ class CHTCollectionViewWaterfallLayout : UICollectionViewLayout{
 
             if heightHeader > 0 {
                 attributes = UICollectionViewLayoutAttributes(forSupplementaryViewOfKind: CHTCollectionElementKindSectionHeader, withIndexPath: NSIndexPath(forRow: 0, inSection: section))
-                attributes.frame = CGRectMake(0, top, self.collectionView!.frame.size.width, heightHeader)
+                attributes.frame = CGRectMake(0, top, self.collectionView!.bounds.size.width, heightHeader)
                 self.headersAttributes.setObject(attributes, forKey: (section))
                 self.allItemAttributes.addObject(attributes)
 
@@ -235,7 +235,7 @@ class CHTCollectionViewWaterfallLayout : UICollectionViewLayout{
 
             if footerHeight > 0 {
                 attributes = UICollectionViewLayoutAttributes(forSupplementaryViewOfKind: CHTCollectionElementKindSectionFooter, withIndexPath: NSIndexPath(forItem: 0, inSection: section))
-                attributes.frame = CGRectMake(0, top, self.collectionView!.frame.size.width, footerHeight)
+                attributes.frame = CGRectMake(0, top, self.collectionView!.bounds.size.width, footerHeight)
                 self.footersAttributes.setObject(attributes, forKey: section)
                 self.allItemAttributes.addObject(attributes)
                 top = CGRectGetMaxY(attributes.frame)