From 7faafe50af3d0d3b3c1eeb40af77d57328fcc0cb Mon Sep 17 00:00:00 2001
From: "gtm.daemon" <gtm.daemon@7dc7ac4e-7543-0410-b95c-c1676fc8e2a3>
Date: Tue, 10 Nov 2009 00:00:26 +0000
Subject: [Author: dmaclach]

Forgot NSAnimationContext when adding duration support.

R=thomasvl
DELTA=13  (13 added, 0 deleted, 0 changed)
TBR=thomasvl
---
 AppKit/GTMNSAnimation+Duration.m | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'AppKit/GTMNSAnimation+Duration.m')

diff --git a/AppKit/GTMNSAnimation+Duration.m b/AppKit/GTMNSAnimation+Duration.m
index f8d0ced..89e3f3e 100644
--- a/AppKit/GTMNSAnimation+Duration.m
+++ b/AppKit/GTMNSAnimation+Duration.m
@@ -23,11 +23,11 @@ static NSTimeInterval GTMCurrentDurationMultiplier(void) {
   NSUInteger modifiers = [event modifierFlags];
   NSTimeInterval duration = 1.0;
   if (modifiers & NSShiftKeyMask) {
-    duration *= 0.2;
+    duration *= 5.0;
   }
-  // These are additive, so shift+control returns 0.1 * duration.
+  // These are additive, so shift+control returns 10 * duration.
   if (modifiers & NSControlKeyMask) {
-    duration *= 0.5;
+    duration *= 2.0;
   }
   return duration;
 }
@@ -43,6 +43,15 @@ static NSTimeInterval GTMCurrentDurationMultiplier(void) {
 
 #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
 
+@implementation NSAnimationContext (GTMNSAnimationDurationAdditions)
+
+- (void)gtm_setDuration:(NSTimeInterval)duration {
+  duration = duration * GTMCurrentDurationMultiplier();
+  [self setDuration:duration];
+}
+
+@end
+
 @implementation CAAnimation (GTMCAAnimationDurationAdditions)
 
 - (void)gtm_setDuration:(CFTimeInterval)duration {
-- 
cgit v1.2.3