Fixed reloading bug in collection view

soffes · Jun 13, 2011 · b2de4a2 · b2de4a2
1 parent 3ef3ac4
commit b2de4a2
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 22 deletions.
diff --git a/SSCatalog/Classes/SCCollectionViewDemoViewController.m b/SSCatalog/Classes/SCCollectionViewDemoViewController.m
@@ -27,6 +27,10 @@ - (void)viewDidLoad {
 	self.title = [[self class] title];
 
 	self.collectionView.extremitiesStyle = SSCollectionViewExtremitiesStyleScrolling;
+
+	UIBarButtonItem *button = [[UIBarButtonItem alloc] initWithTitle:@"Reload" style:UIBarButtonItemStyleBordered target:self.collectionView action:@selector(reloadData)];
+	self.navigationItem.rightBarButtonItem = button;
+	[button release];
 }
 
 

diff --git a/SSToolkit/SSCollectionView.m b/SSToolkit/SSCollectionView.m
@@ -166,8 +166,12 @@ - (id)initWithFrame:(CGRect)frame {
 
 
 - (void)setFrame:(CGRect)frame {
+	BOOL shouldReload = (CGSizeEqualToSize(frame.size, self.frame.size) == NO);
 	[super setFrame:frame];
-	[_tableView reloadData];
+
+	if (shouldReload) {
+		[self reloadData];
+	}
 }
 
 
@@ -376,30 +380,30 @@ - (NSUInteger)_numberOfRowsInSection:(NSUInteger)section {
 	if (numberOfRows) {
 		return [numberOfRows unsignedIntegerValue];
 	}
-	
-        NSUInteger totalItems = [self numberOfItemsInSection:section];
-        NSUInteger itemsPerRow = [self _numberOfItemsPerRowForSection:section];
-        
-        if (itemsPerRow == 0) {
-            return 0;
-        }
-        
-        NSUInteger rows = (NSUInteger)ceilf(totalItems / itemsPerRow);
-        
-        // Check for headers and footers
+
+	NSUInteger totalItems = [self numberOfItemsInSection:section];
+	NSUInteger itemsPerRow = [self _numberOfItemsPerRowForSection:section];
+
+	if (itemsPerRow == 0) {
+		return 0;
+	}
+
+	NSUInteger rows = (NSUInteger)ceilf(totalItems / itemsPerRow);
+
+	// Check for headers and footers
 	if (_extremitiesStyle == SSCollectionViewExtremitiesStyleScrolling) {
 		if ([self _sectionInfoItemForKey:kSSCollectionViewSectionHeaderViewKey section:section]) {
 			rows++;
 		}
-		
+
 		if ([self _sectionInfoItemForKey:kSSCollectionViewSectionFooterViewKey section:section]) {
 			rows++;
 		}
 	}
-	
+
 	[self _setSectionInfoItem:[NSNumber numberWithUnsignedInteger:rows] forKey:kSSCollectionViewSectionNumberOfRowsKey section:section];
-		
-	return [numberOfRows unsignedIntegerValue];
+
+	return rows;
 }
 
 

diff --git a/SSToolkit/SSCollectionViewController.m b/SSToolkit/SSCollectionViewController.m
@@ -48,12 +48,6 @@ - (void)loadView {
 }
 
 
-- (void)viewDidLoad {
-	[super viewDidLoad];
-	[_collectionView reloadData];
-}
-
-
 - (void)viewDidAppear:(BOOL)animated {
 	[super viewDidAppear:animated];
 	[_collectionView.scrollView flashScrollIndicators];