Skip to content
Browse files

Merge remote-tracking branch 'upstream/master'

  • Loading branch information...
2 parents 40a6db8 + e4dff0a commit e121a26e02a630960c11ac93a60f968b60f29b34 @overboming overboming committed Mar 12, 2012
View
2 GMGridView/API/GMGridView.m
@@ -1086,7 +1086,7 @@ - (GMGridViewCell *)newItemSubViewForPosition:(NSInteger)position
NSInteger index = [weakSelf positionForItemSubview:aCell];
if (index != GMGV_INVALID_POSITION)
{
- [weakSelf.dataSource GMGridView:self deleteItemAtIndex:index];
+ [weakSelf.dataSource GMGridView:weakSelf deleteItemAtIndex:index];
[weakSelf removeObjectAtIndex:index];
}
};
View
4 GMGridView/API/GMGridViewLayoutStrategies.m
@@ -155,7 +155,7 @@ - (void)rebaseWithItemCount:(NSInteger)count insideOfBounds:(CGRect)bounds
_numberOfItemsPerRow = 1;
- while ((self.numberOfItemsPerRow + 1) * (self.itemSize.width + self.itemSpacing) - self.itemSpacing < actualBounds.size.width)
+ while ((self.numberOfItemsPerRow + 1) * (self.itemSize.width + self.itemSpacing) - self.itemSpacing <= actualBounds.size.width)
{
_numberOfItemsPerRow++;
}
@@ -271,7 +271,7 @@ - (void)rebaseWithItemCount:(NSInteger)count insideOfBounds:(CGRect)bounds
_numberOfItemsPerColumn = 1;
- while ((_numberOfItemsPerColumn + 1) * (self.itemSize.height + self.itemSpacing) - self.itemSpacing < actualBounds.size.height)
+ while ((_numberOfItemsPerColumn + 1) * (self.itemSize.height + self.itemSpacing) - self.itemSpacing <= actualBounds.size.height)
{
_numberOfItemsPerColumn++;
}
View
2 GMGridView/API/UIView+GMGridViewAdditions.m
@@ -26,7 +26,7 @@
// THE SOFTWARE.
//
-#import <Quartzcore/QuartzCore.h>
+#import <QuartzCore/QuartzCore.h>
#import "UIView+GMGridViewAdditions.h"
@interface UIView (GMGridViewAdditions_Privates)
View
8 README
@@ -6,6 +6,8 @@ GM-GRID-VIEW
---
+Note: major update coming soon! The dev branch will be merged on master.
+
An iOS Grid-View allowing the user to sort the views in the scrollView and also to see the views in fullsize by pinching them.
This view is inspired by the UITableView and uses a datasource and delegates in order to get the data and interact with it.
@@ -18,8 +20,8 @@ Same applies to the layout strategy (vertical, horizontal, paged,... and more to
Many working examples provided in the demo app.
All the files in the API folder are required. You only need to deal with 2 header files though (the grid and the cell).
-Let me know how this component works out for you!
-New feature requests are welcome.
+Let us know how this component works out for you!
+New feature requests are welcome. (ping @gmoledina or @steipete)
---
@@ -33,6 +35,8 @@ Coming soon:
- API for adding a pageControl
- More customization options
+[Check the develop branch (unstable) for features in development]
+
---
Requirements:

0 comments on commit e121a26

Please sign in to comment.
Something went wrong with that request. Please try again.