From 332accd330b679f8ccb0ed0c8916439a39347711 Mon Sep 17 00:00:00 2001 From: "gtm.daemon" Date: Wed, 10 Mar 2010 18:33:34 +0000 Subject: [Author: dmaclach] Change over animation so it will work with other event types than just mouse downs. R=thomasvl DELTA=33 (16 added, 1 deleted, 16 changed) --- AppKit/GTMNSAnimation+Duration.h | 38 ++++++++++++++++++++++++++++---------- 1 file changed, 28 insertions(+), 10 deletions(-) (limited to 'AppKit/GTMNSAnimation+Duration.h') diff --git a/AppKit/GTMNSAnimation+Duration.h b/AppKit/GTMNSAnimation+Duration.h index 4ed7ef9..5d45378 100644 --- a/AppKit/GTMNSAnimation+Duration.h +++ b/AppKit/GTMNSAnimation+Duration.h @@ -6,9 +6,9 @@ // Licensed under the Apache License, Version 2.0 (the "License"); you may not // use this file except in compliance with the License. You may obtain a copy // of the License at -// +// // http://www.apache.org/licenses/LICENSE-2.0 -// +// // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, WITHOUT // WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the @@ -23,25 +23,37 @@ // Given a "normal" duration for an animation, return what it should be based // on the current system state. For example, holding down the shift and/or // control keys modifies the normal duration for an animation making it slower. -// Currently only modifies the duration if the current event is of type -// NSLeftMouseUp and only the control and/or shift modifiers are down. -NSTimeInterval GTMModifyDurationBasedOnCurrentState(NSTimeInterval duration); +// Currently only modifies the duration if the current event is masked by +// eventMask and only the control and/or shift modifiers are down. +NSTimeInterval GTMModifyDurationBasedOnCurrentState(NSTimeInterval duration, + NSUInteger eventMask); + +// The standard eventmask that you want for the methods in this file. Some apps +// (eg Chrome) may not want to have animations fire on key strokes, so will use +// just NSLeftMouseDownMask instead. +extern const NSUInteger kGTMLeftMouseDownAndKeyDownMask; // Categories for changing the duration of an animation based on the current // event. Right now they track the state of the shift and control keys to slow // down animations similar to how minimize window animations occur. @interface NSAnimation (GTMNSAnimationDurationAdditions) -// Note that using this initializer will set the duration of the animation +// Note that using this initializer will set the duration of the animation // 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. -- (id)gtm_initWithDuration:(NSTimeInterval)duration +// Currently only modifies the duration if the current event is masked by +// eventMask and only the control and/or shift modifiers are down. +- (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. -- (void)gtm_setDuration:(NSTimeInterval)duration; +// Currently only modifies the duration if the current event is masked by +// eventMask and only the control and/or shift modifiers are down. +- (void)gtm_setDuration:(NSTimeInterval)duration + eventMask:(NSUInteger)eventMask; @end #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 @@ -52,14 +64,20 @@ NSTimeInterval GTMModifyDurationBasedOnCurrentState(NSTimeInterval duration); // Sets the duration by taking the duration passed in and calling // GTMModifyDurationBasedOnCurrentState to calculate the real duration. -- (void)gtm_setDuration:(NSTimeInterval)duration; +// Currently only modifies the duration if the current event is masked by +// eventMask and only the control and/or shift modifiers are down. +- (void)gtm_setDuration:(NSTimeInterval)duration + eventMask:(NSUInteger)eventMask; @end @interface CAAnimation (GTMCAAnimationDurationAdditions) // Sets the duration by taking the duration passed in and calling // GTMModifyDurationBasedOnCurrentState to calculate the real duration. -- (void)gtm_setDuration:(CFTimeInterval)duration; +// Currently only modifies the duration if the current event is masked by +// eventMask and only the control and/or shift modifiers are down. +- (void)gtm_setDuration:(CFTimeInterval)duration + eventMask:(NSUInteger)events; @end #endif // MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 -- cgit v1.2.3