Merge pull request #128 from beingenious/master

Fix some storyboard incompatibility and collection view behaviours.
steipete · Dec 5, 2012 · 0f491d2 · 0f491d2
2 parents 6d7f8db + 9cd064c
commit 0f491d2
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 0 deletions.
diff --git a/PSTCollectionView/PSTCollectionView.m b/PSTCollectionView/PSTCollectionView.m
@@ -341,6 +341,11 @@ - (id)dequeueReusableCellWithReuseIdentifier:(NSString *)identifier forIndexPath
                 cell = [cellClass new];
             }
         }
+        PSTCollectionViewLayout *layout = [self collectionViewLayout];
+        if ([layout isKindOfClass:[PSTCollectionViewFlowLayout class]]) {
+            CGSize itemSize = ((PSTCollectionViewFlowLayout *)layout).itemSize;
+            cell.bounds = CGRectMake(0, 0, itemSize.width, itemSize.height);
+        }
         cell.collectionView = self;
         cell.reuseIdentifier = identifier;
     }

diff --git a/PSTCollectionView/PSTCollectionViewCell.m b/PSTCollectionView/PSTCollectionViewCell.m
@@ -121,6 +121,26 @@ - (id)initWithFrame:(CGRect)frame {
     return self;
 }
 
+- (id)initWithCoder:(NSCoder *)aDecoder
+{
+    if ((self = [super initWithCoder:aDecoder])) {
+        if ([[self subviews] count] > 0) {
+            _contentView = [self subviews][0];
+        } else {
+            _contentView = [[UIView alloc] initWithFrame:self.bounds];
+            _contentView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+            [self addSubview:_contentView];
+        }
+
+        _backgroundView = [[UIView alloc] initWithFrame:self.bounds];
+        _backgroundView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+        [self insertSubview:_backgroundView belowSubview:_contentView];
+
+        _menuGesture = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(menuGesture:)];
+    }
+    return self;
+}
+
 ///////////////////////////////////////////////////////////////////////////////////////////
 #pragma mark - Public
 

diff --git a/PSTCollectionView/PSTCollectionViewController.m b/PSTCollectionView/PSTCollectionViewController.m
@@ -52,6 +52,8 @@ - (void)loadView {
     // if this is restored from IB, we don't have plain main view.
     if ([self.view isKindOfClass:[PSTCollectionView class]]) {
         _collectionView = (PSTCollectionView *)self.view;
+        self.view = [[UIView alloc] initWithFrame:self.view.bounds];
+        self.collectionView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
     }
 
 	if (_collectionView.delegate == nil) _collectionView.delegate = self;