Adds CCScrollViewDelegate. Only implemented recognition MAC platform

Former-commit-id: b451463

Author: chrene

cocos2d-ui/CCScrollView.h

@@ -25,6 +25,18 @@
 #import "CCNode.h"
 
 @class CCTapDownGestureRecognizer;
+@class CCScrollView;
+
+@protocol CCScrollViewDelegate <NSObject>
+
+@optional
+- (void)scrollViewDidScroll:(CCScrollView *)scrollView;
+- (void)scrollViewWillBeginDragging:(CCScrollView *)scrollView;
+- (void)scrollViewDidEndDragging:(CCScrollView * )scrollView willDecelerate:(BOOL)decelerate;
+- (void)scrollViewWillBeginDecelerating:(CCScrollView *)scrollView;
+- (void)scrollViewDidEndDecelerating:(CCScrollView *)scrollView;
+
+@end
 
 #ifdef __CC_PLATFORM_IOS
 
@@ -52,6 +64,8 @@
     CGPoint _velocity;
 }
 
+@property (nonatomic, weak) id<CCScrollViewDelegate> delegate;
+
 @property (nonatomic,strong) CCNode* contentNode;
 
 @property (nonatomic,assign) BOOL flipYCoordinates;

cocos2d-ui/CCScrollView.m

@@ -335,31 +335,13 @@ - (void) setScrollPosition:(CGPoint)newPos
 
 - (void) setScrollPosition:(CGPoint)newPos animated:(BOOL)animated
 {
+    // Check bounds
+	newPos.x = MAX(MIN(newPos.x, self.maxScrollX), self.minScrollX);
+	newPos.y = MAX(MIN(newPos.y, self.maxScrollY), self.minScrollY);
+
     BOOL xMoved = (newPos.x != self.scrollPosition.x);
     BOOL yMoved = (newPos.y != self.scrollPosition.y);
-    
-    // Check bounds
-    if (newPos.x > self.maxScrollX)
-    {
-        newPos.x = self.maxScrollX;
-        xMoved = YES;
-    }
-    if (newPos.x < self.minScrollX)
-    {
-        newPos.x = self.minScrollX;
-        xMoved = YES;
-    }
-    if (newPos.y > self.maxScrollY)
-    {
-        newPos.y = self.maxScrollY;
-        yMoved = YES;
-    }
-    if (newPos.y < self.minScrollY)
-    {
-        newPos.y = self.minScrollY;
-        yMoved = YES;
-    }
-    
+
     if (animated)
     {
         CGPoint oldPos = self.scrollPosition;
@@ -749,11 +731,35 @@ - (void) onExitTransitionDidStart
 
 - (void)scrollWheel:(NSEvent *)theEvent
 {
-    CCDirector* dir = [CCDirector sharedDirector];
-    
+	CCDirector* dir = [CCDirector sharedDirector];
+
     float deltaX = theEvent.deltaX;
     float deltaY = theEvent.deltaY;
-    
+
+	[self scrollViewDidScroll];
+
+    switch (theEvent.phase) {
+        case NSEventPhaseBegan:
+            [self scrollViewWillBeginDragging];
+            break;
+        case NSEventPhaseEnded:
+			//TODO: add logic to determine if it will decelerate
+            [self scrollViewDidEndDraggingAndWillDecelerate:YES];
+        default:
+            break;
+    }
+
+    switch (theEvent.momentumPhase) {
+        case NSEventPhaseBegan:
+            [self scrollViewWillBeginDecelerating];
+            break;
+        case NSEventPhaseEnded:
+            [self scrollViewDidEndDecelerating];
+        default:
+            break;
+    }
+
+
     // Calculate the delta in node space
     CGPoint ref = [dir convertToGL:CGPointZero];
     ref = [self convertToNodeSpace:ref];
@@ -824,4 +830,46 @@ - (void)scrollWheel:(NSEvent *)theEvent
 
 #endif
 
+
+#pragma mark - CCScrollViewDelegate Helpers
+
+- (void)scrollViewDidScroll
+{
+    if ( [self.delegate respondsToSelector:@selector(scrollViewDidScroll:)] )
+    {
+        [self.delegate scrollViewDidScroll:self];
+    }
+}
+
+- (void)scrollViewWillBeginDragging
+{
+    if ( [self.delegate respondsToSelector:@selector(scrollViewWillBeginDragging:)])
+    {
+        [self.delegate scrollViewWillBeginDragging:self];
+    }
+}
+- (void)scrollViewDidEndDraggingAndWillDecelerate:(BOOL)decelerate
+{
+    if ([self.delegate respondsToSelector:@selector(scrollViewDidEndDragging:willDecelerate:)])
+    {
+        [self.delegate scrollViewDidEndDragging:self
+                                 willDecelerate:decelerate];
+    }
+}
+- (void)scrollViewWillBeginDecelerating
+{
+    if ( [self.delegate respondsToSelector:@selector(scrollViewWillBeginDecelerating:)])
+    {
+        [self.delegate scrollViewWillBeginDecelerating:self];
+    }
+
+}
+- (void)scrollViewDidEndDecelerating
+{
+    if ( [self.delegate respondsToSelector:@selector(scrollViewDidEndDecelerating:)])
+    {
+        [self.delegate scrollViewDidEndDecelerating:self];
+    }
+}
+
 @end