From 2f5cf3e2da5594aa8ba610261130a22fccf0117f Mon Sep 17 00:00:00 2001 From: "gtm.daemon" Date: Fri, 26 Mar 2010 00:33:37 +0000 Subject: [Author: dmaclach] Stop animation slow down applying to shift-tabs. Tab and shift-tab are often used for navigating around UI elements, and in the majority of cases slowing down the animations while navigating around UI elements is not desired. TBR=thomasvl,mrossetti DELTA=24 (15 added, 4 deleted, 5 changed) --- AppKit/GTMNSAnimation+Duration.h | 16 ++++++++-------- AppKit/GTMNSAnimation+Duration.m | 13 ++++++++++++- 2 files changed, 20 insertions(+), 9 deletions(-) (limited to 'AppKit') diff --git a/AppKit/GTMNSAnimation+Duration.h b/AppKit/GTMNSAnimation+Duration.h index 5d45378..060d0b8 100644 --- a/AppKit/GTMNSAnimation+Duration.h +++ b/AppKit/GTMNSAnimation+Duration.h @@ -25,6 +25,10 @@ // control keys modifies the normal duration for an animation making it slower. // Currently only modifies the duration if the current event is masked by // eventMask and only the control and/or shift modifiers are down. +// The shift modifier is ignored if it is applied to a Tab key down. +// Tab and shift-tab are often used for navigating around UI elements, +// and in the majority of cases slowing down the animations while navigating +// around UI elements is not desired. NSTimeInterval GTMModifyDurationBasedOnCurrentState(NSTimeInterval duration, NSUInteger eventMask); @@ -42,16 +46,14 @@ extern const NSUInteger kGTMLeftMouseDownAndKeyDownMask; // based on the current event when the animation is created. If the animation // is to be reused, the duration for the event should be reset with // gtm_setDuration each time the animation is started. -// Currently only modifies the duration if the current event is masked by -// eventMask and only the control and/or shift modifiers are down. +// See notes for GTMModifyDurationBasedOnCurrentState for more info. - (id)gtm_initWithDuration:(NSTimeInterval)duration eventMask:(NSUInteger)eventMask animationCurve:(NSAnimationCurve)animationCurve; // Sets the duration by taking the duration passed in and calling // GTMModifyDurationBasedOnCurrentState to calculate the real duration. -// Currently only modifies the duration if the current event is masked by -// eventMask and only the control and/or shift modifiers are down. +// See notes for GTMModifyDurationBasedOnCurrentState for more info. - (void)gtm_setDuration:(NSTimeInterval)duration eventMask:(NSUInteger)eventMask; @end @@ -64,8 +66,7 @@ extern const NSUInteger kGTMLeftMouseDownAndKeyDownMask; // Sets the duration by taking the duration passed in and calling // GTMModifyDurationBasedOnCurrentState to calculate the real duration. -// Currently only modifies the duration if the current event is masked by -// eventMask and only the control and/or shift modifiers are down. +// See notes for GTMModifyDurationBasedOnCurrentState for more info. - (void)gtm_setDuration:(NSTimeInterval)duration eventMask:(NSUInteger)eventMask; @end @@ -74,8 +75,7 @@ extern const NSUInteger kGTMLeftMouseDownAndKeyDownMask; // Sets the duration by taking the duration passed in and calling // GTMModifyDurationBasedOnCurrentState to calculate the real duration. -// Currently only modifies the duration if the current event is masked by -// eventMask and only the control and/or shift modifiers are down. +// See notes for GTMModifyDurationBasedOnCurrentState for more info. - (void)gtm_setDuration:(CFTimeInterval)duration eventMask:(NSUInteger)events; @end diff --git a/AppKit/GTMNSAnimation+Duration.m b/AppKit/GTMNSAnimation+Duration.m index c47772b..02f2b67 100644 --- a/AppKit/GTMNSAnimation+Duration.m +++ b/AppKit/GTMNSAnimation+Duration.m @@ -29,7 +29,18 @@ NSTimeInterval GTMModifyDurationBasedOnCurrentState(NSTimeInterval duration, if (!(modifiers & (NSAlternateKeyMask | NSCommandKeyMask))) { if (modifiers & NSShiftKeyMask) { - duration *= 5.0; + // 25 is the ascii code generated for a shift-tab (End-of-message) + // The shift modifier is ignored if it is applied to a Tab key down. + // Tab and shift-tab are often used for navigating around UI elements, + // and in the majority of cases slowing down the animations while + // navigating around UI elements is not desired. + if ((eventMask & NSKeyDownMask) + && ([[event characters] length]) + && ([[event characters] characterAtIndex:0] == 25)) { + duration = duration; + } else { + duration *= 5.0; + } } // These are additive, so shift+control returns 10 * duration. if (modifiers & NSControlKeyMask) { -- cgit v1.2.3