remove option for fixed item padding, fixed left margin

Author: Martin Hering

JNWCollectionView/JNWCollectionViewGridLayout.h

@@ -62,11 +62,6 @@ extern NSString * const JNWCollectionViewGridLayoutFooterKind;
 /// override any value set here.
 @property (nonatomic, assign) CGSize itemSize;
 
-/// Choose whether even padding between horizontal items is enabled.
-///
-/// Default is YES.
-@property (nonatomic, assign) BOOL itemPaddingEnabled;
-
 /// The vertical spacing between rows in the grid.
 ///
 /// Defaults to 0.
@@ -78,3 +73,12 @@ extern NSString * const JNWCollectionViewGridLayoutFooterKind;
 @property (nonatomic, assign) CGFloat itemHorizontalMargin;
 
 @end
+
+
+@interface JNWCollectionViewGridLayout (Deprecated)
+/// Choose whether even padding between horizontal items is enabled.
+/// Not used anymore. Please use Flow Layout.
+///
+/// Default is YES.
+@property (nonatomic, assign) BOOL itemPaddingEnabled;
+@end

JNWCollectionView/JNWCollectionViewGridLayout.m

@@ -72,8 +72,6 @@ - (instancetype)init {
 	self = [super init];
 	if (self == nil) return nil;
 	self.itemSize = JNWCollectionViewGridLayoutDefaultSize;
-	self.itemPaddingEnabled = YES;
-;
 	return self;
 }
 
@@ -117,12 +115,8 @@ - (void)prepareLayout {
 
 	CGFloat itemPadding = 0;
 	if (numberOfColumns > 0) {
-		if (self.itemHorizontalMargin == 0 && self.itemPaddingEnabled) {
-			CGFloat totalPadding = totalWidth - (numberOfColumns * itemSize.width);
-			itemPadding = floorf(totalPadding / numberOfColumns);
-        } else {
-            itemPadding = self.itemHorizontalMargin;
-        }
+        CGFloat totalPadding = totalWidth - (numberOfColumns * itemSize.width);
+        itemPadding = floorf(totalPadding / numberOfColumns);
 	}
 	else {
 		numberOfColumns = 1;
@@ -147,7 +141,7 @@ - (void)prepareLayout {
 		for (NSInteger item = 0; item < numberOfItems; item++) {
 			CGPoint origin = CGPointZero;
 			NSInteger column = ((item - (item % numberOfColumns)) / numberOfColumns);
-            origin.x = sectionInsets.left + itemPadding/2 + totalWidth/numberOfColumns * (item % numberOfColumns);
+            origin.x = sectionInsets.left + self.itemHorizontalMargin/2 + itemPadding/2 + totalWidth/numberOfColumns * (item % numberOfColumns);
 			origin.y = column * itemSize.height + column * verticalSpacing;
 			sectionInfo.itemInfo[item].origin = origin;
 		}

demo/JNWCollectionViewDemo/GridDemoViewController.m

@@ -28,6 +28,7 @@ - (void)awakeFromNib {
 	JNWCollectionViewGridLayout *gridLayout = [[JNWCollectionViewGridLayout alloc] init];
 	gridLayout.delegate = self;
 	gridLayout.verticalSpacing = 10.f;
+    gridLayout.itemHorizontalMargin = 10.f;
 
 	self.collectionView.collectionViewLayout = gridLayout;
 	self.collectionView.dataSource = self;