Merge branch 'master' of git://github.com/catlan/AQGridView into edit…

…ing-support

* 'master' of git://github.com/catlan/AQGridView:
  add editing support
  add indexForCell
  FIX: gridView isn't scrollable when the number of items fits into its view area
  FIX: gridView isn't scrollable when the number of items fits in the viewable area
  add selectionGlowShadowRadius property

Classes/AQGridView.h

@@ -83,6 +83,9 @@ typedef enum {
 
 - (CGRect) gridView: (AQGridView *) gridView adjustCellFrame: (CGRect) cellFrame withinGridCellFrame: (CGRect) gridCellFrame;
 
+// Editing
+- (void)gridView:(AQGridView *)aGridView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndex:(NSUInteger)index;
+
 @end
 
 extern NSString * const AQGridViewSelectionDidChangeNotification;
@@ -151,6 +154,8 @@ extern NSString * const AQGridViewSelectionDidChangeNotification;
 
 		unsigned	dataSourceGridCellSize:1;
 
+        unsigned int isEditing:1;
+
 		unsigned	__RESERVED__:1;
 	} _flags;
 }
@@ -236,6 +241,11 @@ extern NSString * const AQGridViewSelectionDidChangeNotification;
 
 @property (nonatomic, readonly) BOOL isAnimatingUpdates;
 
+// Editing
+
+@property(nonatomic,getter=isEditing) BOOL editing;                             // default is NO. setting is not animated.
+- (void)setEditing:(BOOL)editing animated:(BOOL)animated;
+
 @end
 
 @protocol AQGridViewDataSource <NSObject>

Classes/AQGridView.m

@@ -538,6 +538,16 @@ - (void) setBounds: (CGRect) bounds
 		[self handleGridViewBoundsChanged: oldBounds toNewBounds: bounds];
 }
 
+- (BOOL) isEditing
+{
+	return ( _flags.isEditing == 1 );
+}
+
+- (void) setEditing: (BOOL) value
+{
+	[self setEditing:value animated:NO];
+}
+
 #pragma mark -
 #pragma mark Data Management
 
@@ -993,6 +1003,16 @@ - (void) moveItemAtIndex: (NSUInteger) index toIndex: (NSUInteger) newIndex with
 		[self endUpdateAnimations];
 }
 
+- (void)setEditing:(BOOL)editing animated:(BOOL)animated
+{
+	_flags.isEditing = (editing ? 1 : 0);
+
+	NSArray *visibleCells = [self visibleCells];
+	for (AQGridViewCell *aCell in visibleCells) {
+		[aCell setEditing:editing animated:animated];
+	}
+}
+
 #pragma mark -
 #pragma mark Selection
 
@@ -2036,6 +2056,7 @@ - (AQGridViewCell *) createPreparedCellForIndex: (NSUInteger) index usingGridDat
 	[UIView setAnimationsEnabled: NO];
 	AQGridViewCell * cell = [_dataSource gridView: self cellForItemAtIndex: index];
 	cell.separatorStyle = _flags.separatorStyle;
+	cell.editing = self.editing;
 	cell.displayIndex = index;
 
 	cell.frame = [self fixCellFrame: cell.frame forGridRect: [gridData cellRectAtIndex: index]];

Classes/AQGridViewCell.h

@@ -83,8 +83,9 @@ typedef enum {
 		unsigned int highlighted:1;
 		unsigned int becomingHighlighted:1;
         unsigned int setShadowPath:1;
+        unsigned int editing:1;
 		unsigned int hiddenForAnimation:1;
-		unsigned int __RESERVED__:15;
+		unsigned int __RESERVED__:14;
 	} _cellFlags;
 }
 
@@ -115,4 +116,9 @@ typedef enum {
 - (void) setSelected: (BOOL) selected animated: (BOOL) animated;
 - (void) setHighlighted: (BOOL) highlighted animated: (BOOL) animated;
 
+// Editing
+
+@property(nonatomic,getter=isEditing) BOOL          editing;                    // show appropriate edit controls (+/- & reorder). By default -setEditing: calls setEditing:animated: with NO for animated.
+- (void)setEditing:(BOOL)editing animated:(BOOL)animated;
+
 @end

Classes/AQGridViewCell.m

@@ -607,6 +607,21 @@ - (void) prepareForReuse
     _cellFlags.setShadowPath = 0;
 }
 
+- (BOOL) isEditing
+{
+	return ( _cellFlags.editing == 1 );
+}
+
+- (void) setEditing: (BOOL) value
+{
+	[self setEditing:value animated:NO];
+}
+
+- (void)setEditing:(BOOL)editing animated:(BOOL)animated
+{
+	_cellFlags.editing = (editing ? 1 : 0);
+}
+
 @end
 
 @implementation AQGridViewCell (AQGridViewCellPrivate)