Adds iOS callbacks for CCScrollViewDelegate + Fixes scrollViewDidEndDecelerating for mac

Former-commit-id: 0ca53b2

Author: chrene

cocos2d-ui-tests/tests/CCScrollViewTest.m

@@ -24,7 +24,7 @@
 
 #import "TestBase.h"
 
-@interface CCScrollViewTest : TestBase @end
+@interface CCScrollViewTest : TestBase <CCScrollViewDelegate> @end
 
 @implementation CCScrollViewTest
 
@@ -46,10 +46,36 @@ - (void)setupScrollViewBasicTest
 
     CCScrollView* scrollView = [[CCScrollView alloc] initWithContentNode:[self createScrollContent]];
     scrollView.flipYCoordinates = NO;
+	scrollView.delegate = self;
 
     [self.contentNode addChild:scrollView];
 }
 
+- (void)scrollViewDidEndDecelerating:(CCScrollView *)scrollView
+{
+	CCLOG(@"did end decelerating");
+}
+
+- (void)scrollViewDidEndDragging:(CCScrollView *)scrollView willDecelerate:(BOOL)decelerate
+{
+	CCLOG(@"did end dragging, decelerate: %@", decelerate ? @"YES" : @"NO");
+}
+
+- (void)scrollViewWillBeginDecelerating:(CCScrollView *)scrollView
+{
+	CCLOG(@"will begin decelerating");
+}
+
+- (void)scrollViewWillBeginDragging:(CCScrollView *)scrollView
+{
+	CCLOG(@"will begin dragging");
+}
+
+- (void)scrollViewDidScroll:(CCScrollView *)scrollView
+{
+	//CCLOG(@"Scrolling");
+}
+
 - (void)setupScrollViewPagingTest
 {
     self.subTitle = @"Paging - Pan the content layer it should snap into a 3 x 3 grid.";

cocos2d-ui/CCScrollView.m

@@ -91,15 +91,18 @@ @interface CCMoveToX : CCActionInterval
 {
 	float _endPosition;
 	float _startPos;
+	void (^block)(void);
 }
 @end
 
 @implementation CCMoveToX
 
--(id) initWithDuration: (CCTime) t positionX: (float) p
+-(id) initWithDuration: (CCTime) t positionX: (float) p callback:(void(^)(void))callback
 {
-	if( (self=[super initWithDuration: t]) )
+	if( (self=[super initWithDuration: t]) ) {
 		_endPosition = p;
+		block = callback;
+	}
 	return self;
 }
 
@@ -119,6 +122,7 @@ -(void) update: (CCTime) t
     float y = node.position.y;
 
 	node.position = ccp(x,y);
+	block();
 }
 @end
 
@@ -127,15 +131,18 @@ @interface CCMoveToY : CCActionInterval
 {
 	float _endPosition;
 	float _startPos;
+	void (^block)(void);
 }
 @end
 
 @implementation CCMoveToY
 
--(id) initWithDuration: (CCTime) t positionY: (float) p
+-(id) initWithDuration: (CCTime) t positionY: (float) p callback:(void(^)(void))callback
 {
-	if( (self=[super initWithDuration: t]) )
+	if( (self=[super initWithDuration: t]) ) {
 		_endPosition = p;
+		block = [callback copy];
+	}
 	return self;
 }
 
@@ -155,14 +162,21 @@ -(void) update: (CCTime) t
     float x = node.position.x;
 
 	node.position = ccp(x,y);
+	block();
 }
 @end
 
 
 #pragma mark -
 #pragma mark CCScrollView
 
-@implementation CCScrollView
+@implementation CCScrollView {
+	BOOL _decelerating;
+
+#ifdef __CC_PLATFORM_MAC
+	CGPoint _lastPosition;
+#endif
+}
 
 #pragma mark Initializers
 
@@ -357,7 +371,9 @@ - (void) setScrollPosition:(CGPoint)newPos animated:(BOOL)animated
             _animatingX = YES;
 
             // Create animation action
-            CCActionInterval* action = [CCActionEaseOut actionWithAction:[[CCMoveToX alloc] initWithDuration:duration positionX:-newPos.x] rate:2];
+            CCActionInterval* action = [CCActionEaseOut actionWithAction:[[CCMoveToX alloc] initWithDuration:duration positionX:-newPos.x callback:^{
+				[self scrollViewDidScroll];
+			}] rate:2];
             CCActionCallFunc* callFunc = [CCActionCallFunc actionWithTarget:self selector:@selector(xAnimationDone)];
             action = [CCActionSequence actions:action, callFunc, nil];
             action.tag = kCCScrollViewActionXTag;
@@ -371,7 +387,9 @@ - (void) setScrollPosition:(CGPoint)newPos animated:(BOOL)animated
             _animatingY = YES;
 
             // Create animation action
-            CCActionInterval* action = [CCActionEaseOut actionWithAction:[[CCMoveToY alloc] initWithDuration:duration positionY:-newPos.y] rate:2];
+            CCActionInterval* action = [CCActionEaseOut actionWithAction:[[CCMoveToY alloc] initWithDuration:duration positionY:-newPos.y callback:^{
+				[self scrollViewDidScroll];
+			}] rate:2];
             CCActionCallFunc* callFunc = [CCActionCallFunc actionWithTarget:self selector:@selector(yAnimationDone)];
             action = [CCActionSequence actions:action, callFunc, nil];
             action.tag = kCCScrollViewActionYTag;
@@ -381,6 +399,9 @@ - (void) setScrollPosition:(CGPoint)newPos animated:(BOOL)animated
     }
     else
     {
+#ifdef __CC_PLATFORM_MAC
+		_lastPosition = self.scrollPosition;
+#endif
         [_contentNode stopActionByTag:kCCScrollViewActionXTag];
         [_contentNode stopActionByTag:kCCScrollViewActionYTag];
         _contentNode.position = ccpMult(newPos, -1);
@@ -435,15 +456,32 @@ - (void) panLayerToTarget:(CGPoint) newPos
         if (newPos.y > self.maxScrollY) newPos.y = self.maxScrollY;
         if (newPos.y < self.minScrollY) newPos.y = self.minScrollY;
     }
-    
+    [self scrollViewDidScroll];
     _contentNode.position = ccpMult(newPos, -1);
 }
 
 - (void) update:(CCTime)df
 {
     float fps = 1.0/df;
     float p = 60/fps;
-    
+
+	if (! CGPointEqualToPoint(_velocity, CGPointZero) ) {
+		[self scrollViewDidScroll];
+	} else {
+
+#ifdef __CC_PLATFORM_IOS
+		if ( _decelerating && !(_animatingX || _animatingY)) {
+			[self scrollViewDidEndDecelerating];
+			_decelerating = NO;
+		}
+#elif defined(__CC_PLATFORM_MAC)
+		if ( _decelerating && CGPointEqualToPoint(_lastPosition, self.scrollPosition)) {
+			[self scrollViewDidEndDecelerating];
+			_decelerating = NO;
+		}
+#endif
+    }
+
     if (!_isPanning)
     {
         if (_velocity.x != 0 || _velocity.y != 0)
@@ -535,6 +573,7 @@ - (void)handlePan:(UIGestureRecognizer *)gestureRecognizer
 
     if (pgr.state == UIGestureRecognizerStateBegan)
     {
+		[self scrollViewWillBeginDragging];
         _animatingX = NO;
         _animatingY = NO;
         _rawTranslationStart = rawTranslation;
@@ -563,6 +602,7 @@ - (void)handlePan:(UIGestureRecognizer *)gestureRecognizer
     }
     else if (pgr.state == UIGestureRecognizerStateEnded)
     {
+
         // Calculate the velocity in node space
         CGPoint ref = [dir convertToGL:CGPointZero];
         ref = [self convertToNodeSpace:ref];
@@ -577,6 +617,7 @@ - (void)handlePan:(UIGestureRecognizer *)gestureRecognizer
         // Check if scroll directions has been disabled
         if (!_horizontalScrollEnabled) _velocity.x = 0;
         if (!_verticalScrollEnabled) _velocity.y = 0;
+		[self scrollViewDidEndDraggingAndWillDecelerate:!CGPointEqualToPoint(_velocity, CGPointZero)];
 
         // Setup a target if paging is enabled
         if (_pagingEnabled)
@@ -615,7 +656,8 @@ - (void)handlePan:(UIGestureRecognizer *)gestureRecognizer
 
             _velocity = CGPointZero;
         }
-        
+        [self scrollViewWillBeginDecelerating];
+		_decelerating = YES;
         _isPanning = NO;
     }
     else if (pgr.state == UIGestureRecognizerStateCancelled)
@@ -745,21 +787,16 @@ - (void)scrollWheel:(NSEvent *)theEvent
         case NSEventPhaseEnded:
 			//TODO: add logic to determine if it will decelerate
             [self scrollViewDidEndDraggingAndWillDecelerate:YES];
+			_decelerating = YES;
         default:
             break;
     }
 
-    switch (theEvent.momentumPhase) {
-        case NSEventPhaseBegan:
-            [self scrollViewWillBeginDecelerating];
-            break;
-        case NSEventPhaseEnded:
-            [self scrollViewDidEndDecelerating];
-        default:
-            break;
+    if (theEvent.momentumPhase == NSEventPhaseBegan)
+	{
+		[self scrollViewWillBeginDecelerating];
     }
 
-
     // Calculate the delta in node space
     CGPoint ref = [dir convertToGL:CGPointZero];
     ref = [self convertToNodeSpace:ref];
@@ -774,6 +811,7 @@ - (void)scrollWheel:(NSEvent *)theEvent
     // Flip coordinates
     if (_flipYCoordinates) delta.y = -delta.y;
     delta.x = -delta.x;
+
 
     // Handle disabled x/y axis
     if (!_horizontalScrollEnabled) delta.x = 0;
@@ -824,7 +862,7 @@ - (void)scrollWheel:(NSEvent *)theEvent
         // Update scroll position
         CGPoint scrollPos = self.scrollPosition;
         scrollPos = ccpAdd(delta, scrollPos);
-        self.scrollPosition = scrollPos;
+		self.scrollPosition = scrollPos;
     }
 }
 
@@ -858,10 +896,13 @@ - (void)scrollViewDidEndDraggingAndWillDecelerate:(BOOL)decelerate
 }
 - (void)scrollViewWillBeginDecelerating
 {
-    if ( [self.delegate respondsToSelector:@selector(scrollViewWillBeginDecelerating:)])
+	if ( !_pagingEnabled )
     {
-        [self.delegate scrollViewWillBeginDecelerating:self];
-    }
+		if ( [self.delegate respondsToSelector:@selector(scrollViewWillBeginDecelerating:)])
+		{
+			[self.delegate scrollViewWillBeginDecelerating:self];
+		}
+	}
 
 }
 - (void)scrollViewDidEndDecelerating