diff options
author | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-14 19:35:37 +0000 |
---|---|---|
committer | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-14 19:35:37 +0000 |
commit | 231744281811c63cf15f6d6a7e02b85bc549506c (patch) | |
tree | edbe437798399514d3e8df98035781ad19743ae3 /chrome/browser/cocoa/extensions/browser_action_button.mm | |
parent | 33410c838b3d0ad411bb16b905e0188eacb40fb9 (diff) | |
download | chromium_src-231744281811c63cf15f6d6a7e02b85bc549506c.zip chromium_src-231744281811c63cf15f6d6a7e02b85bc549506c.tar.gz chromium_src-231744281811c63cf15f6d6a7e02b85bc549506c.tar.bz2 |
[Mac] Fix MouseDown/MouseUp error for Steve animation effects
- Pull in new GTM with Animation fixes
- Switch masks to be mouse up, not down.
- Remove the steve effect from places where users don't really trigger the animation, so the effect doesn't seem "random"
- Move the animation duration set to be per click in the prefs window instead of binding the time at window open.
BUG=41393
TEST=Steve animation effects are back.
Review URL: http://codereview.chromium.org/1618021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44516 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/extensions/browser_action_button.mm')
-rw-r--r-- | chrome/browser/cocoa/extensions/browser_action_button.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/cocoa/extensions/browser_action_button.mm b/chrome/browser/cocoa/extensions/browser_action_button.mm index 863b56b..81b6e41 100644 --- a/chrome/browser/cocoa/extensions/browser_action_button.mm +++ b/chrome/browser/cocoa/extensions/browser_action_button.mm @@ -150,7 +150,7 @@ class ExtensionImageTrackerBridge : public NotificationObserver, moveAnimation_.reset([[NSViewAnimation alloc] init]); [moveAnimation_ gtm_setDuration:kAnimationDuration - eventMask:NSLeftMouseDownMask]; + eventMask:NSLeftMouseUpMask]; [moveAnimation_ setAnimationBlockingMode:NSAnimationNonblocking]; [self updateState]; |