Merge remote-tracking branch 'origin/develop-v3.x' into develop-v3.5

Author: s1ddok

cocos2d-ui/CCScrollView.m

@@ -740,6 +740,13 @@ - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldRecogni
     return (otherGestureRecognizer == _panRecognizer || otherGestureRecognizer == _tapRecognizer);
 }
 
+- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer
+shouldRequireFailureOfGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer
+{
+    return true;
+}
+
+
 - (void) onEnterTransitionDidFinish
 {
     NSAssert(_panRecognizer.view == nil && _tapRecognizer.view == nil, @"CCScrollView: Probable double call into onEnterTransitionDidFinish - gesture recognizers are already added");

cocos2d-ui/CCTableView.h

@@ -27,13 +27,26 @@
 @class CCButton;
 @class CCTableView;
 
+
+#pragma mark CCTableViewCellProtocol
+
+/** Requirements for implementing a custom Table View Cell.
+    Note that the custom cell MUST inherit CCNode.*/
+
+@protocol CCTableViewCellProtocol <NSObject>
+
+@property (nonatomic, assign) NSUInteger index;
+- (void) pressedCell:(id)sender;
+
+@end
+
 #pragma mark CCTableViewCell
 
 /** Represents a cell in a CCTableView. It is essentially a thin wrapper around CCButton that allows the user to interact with the cell.
  You can add any node(s) as content to the cell. */
-@interface CCTableViewCell : CCNode
+@interface CCTableViewCell : CCNode <CCTableViewCellProtocol>
 {
-    NSUInteger _index;
+
 }
 
 /** The CCButton instance used to allow interaction with the cell. */
@@ -56,7 +69,7 @@
  @param tableView The CCTableView that is requesting a cell for the index.
  @param index The index of the cell that is requested.
  @returns The CCTableViewCell for the given index. */
-- (CCTableViewCell*) tableView:(CCTableView*)tableView nodeForRowAtIndex:(NSUInteger) index;
+- (id<CCTableViewCellProtocol>) tableView:(CCTableView*)tableView nodeForRowAtIndex:(NSUInteger) index;
 /** Requests the number of rows in the given table view.
  @param tableView The CCTableView for which the number of rows should be returned.
  @returns The number of rows in the table view. */
@@ -211,5 +224,6 @@
  @param target The object that should receive the selector.
  @param selector The selector to run, ie `@selector(onRowSelected:)`. */
 -(void) setTarget:(id)target selector:(SEL)selector;
+-(void) selectedRow:(NSUInteger)row;
 
 @end

cocos2d-ui/CCTableView.m

@@ -38,7 +38,7 @@ - (void) selectedRow:(NSUInteger) row;
 
 @interface CCTableViewCellHolder : NSObject
 
-@property (nonatomic,strong) CCTableViewCell* cell;
+@property (nonatomic,strong) id<CCTableViewCellProtocol> cell;
 
 @end
 
@@ -67,12 +67,13 @@ - (void) setPosition:(CGPoint)position
 
 @interface CCTableViewCell (Helper)
 
-@property (nonatomic,assign) NSUInteger index;
-
 @end
 
+
 @implementation CCTableViewCell
 
+@synthesize index;
+
 - (id) init
 {
     self = [super init];
@@ -94,16 +95,6 @@ - (void) pressedCell:(id)sender
     [(CCTableView*)(self.parent.parent) selectedRow:self.index];
 }
 
-- (void) setIndex:(NSUInteger)index
-{
-    _index = index;
-}
-
-- (NSUInteger) index
-{
-    return _index;
-}
-
 @end
 
 
@@ -244,7 +235,7 @@ - (void) showRowsForRange:(NSRange)range
             CCTableViewCellHolder* holder = [_rows objectAtIndex:oldIdx];
             if (holder)
             {
-                [self.contentNode removeChild:holder.cell cleanup:YES];
+                [self.contentNode removeChild:(CCNode*)holder.cell cleanup:YES];
                 holder.cell = NULL;
             }
         }
@@ -255,18 +246,23 @@ - (void) showRowsForRange:(NSRange)range
         if (!NSLocationInRange(newIdx, _currentlyVisibleRange))
         {
             CCTableViewCellHolder* holder = [_rows objectAtIndex:newIdx];
+            CCNode* node;
             if (!holder.cell)
             {
                 holder.cell = [_dataSource tableView:self nodeForRowAtIndex:newIdx];
                 holder.cell.index = newIdx;
-                holder.cell.position = CGPointMake(0, [self locationForCellWithIndex:newIdx]);
-                holder.cell.positionType = CCPositionTypeMake(CCPositionUnitPoints, CCPositionUnitPoints, CCPositionReferenceCornerTopLeft);
-                holder.cell.anchorPoint = CGPointMake(0, 1);
+                
+                node = (CCNode*)holder.cell;
+                node.position = CGPointMake(0, [self locationForCellWithIndex:newIdx]);
+                node.positionType = CCPositionTypeMake(CCPositionUnitPoints, CCPositionUnitPoints, CCPositionReferenceCornerTopLeft);
+                node.anchorPoint = CGPointMake(0, 1);
+            } else {
+                node = (CCNode*)holder.cell;
             }
 
             if (holder.cell)
             {
-                [self.contentNode addChild:holder.cell];
+                [self.contentNode addChild:node];
             }
         }
     }
@@ -395,7 +391,7 @@ - (void) setTarget:(id)target selector:(SEL)selector
 	}];
 }
 
-- (void) selectedRow:(NSUInteger) row
+- (void) selectedRow:(NSUInteger)row
 {
     self.selectedRow = row;
     [self triggerAction];