Added properties to configure expand/close menu item rotations.

lydonchandra · Mar 20, 2012 · 47c1f4e · 47c1f4e
1 parent 9e5d100
commit 47c1f4e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/AwesomeMenu/QuadCurveMenu/QuadCurveMenu.h b/AwesomeMenu/QuadCurveMenu/QuadCurveMenu.h
@@ -38,6 +38,8 @@
 @property (nonatomic, assign) CGFloat timeOffset;
 @property (nonatomic, assign) CGFloat rotateAngle;
 @property (nonatomic, assign) CGFloat menuWholeAngle;
+@property (nonatomic, assign) CGFloat expandRotation;
+@property (nonatomic, assign) CGFloat closeRotation;
 
 - (id)initWithFrame:(CGRect)frame menus:(NSArray *)aMenusArray;
 @end

diff --git a/AwesomeMenu/QuadCurveMenu/QuadCurveMenu.m b/AwesomeMenu/QuadCurveMenu/QuadCurveMenu.m
@@ -17,6 +17,8 @@
 static CGFloat const kQuadCurveMenuDefaultTimeOffset = 0.036f;
 static CGFloat const kQuadCurveMenuDefaultRotateAngle = 0.0;
 static CGFloat const kQuadCurveMenuDefaultMenuWholeAngle = M_PI * 2;
+static CGFloat const kQuadCurveMenuDefaultExpandRotation = M_PI;
+static CGFloat const kQuadCurveMenuDefaultCloseRotation = M_PI * 2;
 
 
 static CGPoint RotateCGPointAroundCenter(CGPoint point, CGPoint center, float angle)
@@ -37,7 +39,7 @@ - (CAAnimationGroup *)_shrinkAnimationAtPoint:(CGPoint)p;
 
 @implementation QuadCurveMenu
 
-@synthesize nearRadius, endRadius, farRadius, timeOffset, rotateAngle, menuWholeAngle, startPoint;
+@synthesize nearRadius, endRadius, farRadius, timeOffset, rotateAngle, menuWholeAngle, startPoint, expandRotation, closeRotation;
 @synthesize expanding = _expanding;
 @synthesize delegate = _delegate;
 @synthesize menusArray = _menusArray;
@@ -56,6 +58,8 @@ - (id)initWithFrame:(CGRect)frame menus:(NSArray *)aMenusArray
 		self.rotateAngle = kQuadCurveMenuDefaultRotateAngle;
 		self.menuWholeAngle = kQuadCurveMenuDefaultMenuWholeAngle;
 		self.startPoint = CGPointMake(kQuadCurveMenuDefaultStartPointX, kQuadCurveMenuDefaultStartPointY);
+        self.expandRotation = kQuadCurveMenuDefaultExpandRotation;
+        self.closeRotation = kQuadCurveMenuDefaultCloseRotation;
 
         // layout menus
         self.menusArray = aMenusArray;
@@ -272,7 +276,7 @@ - (void)_expand
     QuadCurveMenuItem *item = (QuadCurveMenuItem *)[self viewWithTag:tag];
 
     CAKeyframeAnimation *rotateAnimation = [CAKeyframeAnimation animationWithKeyPath:@"transform.rotation.z"];
-    rotateAnimation.values = [NSArray arrayWithObjects:[NSNumber numberWithFloat:M_PI],[NSNumber numberWithFloat:0.0f], nil];
+    rotateAnimation.values = [NSArray arrayWithObjects:[NSNumber numberWithFloat:expandRotation],[NSNumber numberWithFloat:0.0f], nil];
     rotateAnimation.duration = 0.5f;
     rotateAnimation.keyTimes = [NSArray arrayWithObjects:
                                 [NSNumber numberWithFloat:.3], 
@@ -314,7 +318,7 @@ - (void)_close
      QuadCurveMenuItem *item = (QuadCurveMenuItem *)[self viewWithTag:tag];
 
     CAKeyframeAnimation *rotateAnimation = [CAKeyframeAnimation animationWithKeyPath:@"transform.rotation.z"];
-    rotateAnimation.values = [NSArray arrayWithObjects:[NSNumber numberWithFloat:0.0f],[NSNumber numberWithFloat:M_PI * 2],[NSNumber numberWithFloat:0.0f], nil];
+    rotateAnimation.values = [NSArray arrayWithObjects:[NSNumber numberWithFloat:0.0f],[NSNumber numberWithFloat:closeRotation],[NSNumber numberWithFloat:0.0f], nil];
     rotateAnimation.duration = 0.5f;
     rotateAnimation.keyTimes = [NSArray arrayWithObjects:
                                 [NSNumber numberWithFloat:.0],