Set up NSAnimationContext groupings in parallel with TUIView animatio…

…ns, so that any direct NSView changes are animated in parallel
adib · Jul 19, 2012 · 585ca4a · 585ca4a
1 parent ad2bb97
commit 585ca4a
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/lib/UIKit/TUIView+Animation.m b/lib/UIKit/TUIView+Animation.m
@@ -145,6 +145,8 @@ + (void)animateWithDuration:(NSTimeInterval)duration animations:(void (^)(void))
 
 + (void)beginAnimations:(NSString *)animationID context:(void *)context
 {
+	[NSAnimationContext beginGrouping];
+
 	TUIViewAnimation *animation = [[TUIViewAnimation alloc] init];
 	animation.context = context;
 	animation.animationID = animationID;
@@ -160,6 +162,7 @@ + (void)beginAnimations:(NSString *)animationID context:(void *)context
 + (void)commitAnimations
 {
 	[[self _animationStack] removeLastObject];
+	[NSAnimationContext endGrouping];
 
 //	NSLog(@"--- %d", [[self _animationStack] count]);
 }
@@ -188,7 +191,9 @@ static CGFloat SlomoTime()
 
 + (void)setAnimationDuration:(NSTimeInterval)duration
 {
-	[self _currentAnimation].basicAnimation.duration = duration * SlomoTime();
+	duration *= SlomoTime();
+	[self _currentAnimation].basicAnimation.duration = duration;
+	[NSAnimationContext currentContext].duration = duration;
 }
 
 + (void)setAnimationDelay:(NSTimeInterval)delay                    // default = 0.0