aboutsummaryrefslogtreecommitdiff
path: root/AppKit/GTMNSAnimation+Duration.m
diff options
context:
space:
mode:
authorGravatar gtm.daemon <gtm.daemon@7dc7ac4e-7543-0410-b95c-c1676fc8e2a3>2010-03-26 18:05:21 +0000
committerGravatar gtm.daemon <gtm.daemon@7dc7ac4e-7543-0410-b95c-c1676fc8e2a3>2010-03-26 18:05:21 +0000
commit1c82518f5bd4a505516cb3a22df61b3fd279df14 (patch)
tree0c246282101c4e3d51a60ba204075c82e85fc3c9 /AppKit/GTMNSAnimation+Duration.m
parent2f5cf3e2da5594aa8ba610261130a22fccf0117f (diff)
[Author: dmaclach]
Clean up issues brought up in recent TBR. Check for single character, and check to make sure ctrl isn't down as well. R=thomasvl DELTA=2 (1 added, 0 deleted, 1 changed)
Diffstat (limited to 'AppKit/GTMNSAnimation+Duration.m')
-rw-r--r--AppKit/GTMNSAnimation+Duration.m3
1 files changed, 2 insertions, 1 deletions
diff --git a/AppKit/GTMNSAnimation+Duration.m b/AppKit/GTMNSAnimation+Duration.m
index 02f2b67..5155c38 100644
--- a/AppKit/GTMNSAnimation+Duration.m
+++ b/AppKit/GTMNSAnimation+Duration.m
@@ -35,7 +35,8 @@ NSTimeInterval GTMModifyDurationBasedOnCurrentState(NSTimeInterval duration,
// and in the majority of cases slowing down the animations while
// navigating around UI elements is not desired.
if ((eventMask & NSKeyDownMask)
- && ([[event characters] length])
+ && !(modifiers & NSControlKeyMask)
+ && ([[event characters] length] == 1)
&& ([[event characters] characterAtIndex:0] == 25)) {
duration = duration;
} else {