diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-21 21:21:39 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-21 21:21:39 +0000 |
| commit | 9347ce27d8a73c39c9702489f0c3125d1d391395 (patch) | |
| tree | 195ee4dd0826810edae326b79e60a39960ae084d /chrome/browser | |
| parent | 4f82074f1fa34b7cc2eeb6e9ae1e2c29db86978c (diff) | |
| download | chromium_src-9347ce27d8a73c39c9702489f0c3125d1d391395.zip chromium_src-9347ce27d8a73c39c9702489f0c3125d1d391395.tar.gz chromium_src-9347ce27d8a73c39c9702489f0c3125d1d391395.tar.bz2 | |
Merge 143021 - Fix wobbling of find bar.
BUG=133376
TEST=as in bug
Review URL: https://chromiumcodereview.appspot.com/10574021
TBR=avi@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10641010
git-svn-id: svn://svn.chromium.org/chrome/branches/1180/src@143455 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm b/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm index e34a359..642ca64 100644 --- a/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm +++ b/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm @@ -424,7 +424,7 @@ const float kRightEdgeOffset = 25; [[NSViewAnimation alloc] initWithViewAnimations:[NSArray arrayWithObjects:dict, nil]]; [animation gtm_setDuration:duration - eventMask:NSLeftMouseUpMask]; + eventMask:NSLeftMouseUpMask]; [animation setDelegate:self]; [animation startAnimation]; return animation; @@ -507,6 +507,8 @@ const float kRightEdgeOffset = 25; NSView* view = [self view]; NSRect frame = [view frame]; float x = [self findBarHorizontalPosition]; + if (frame.origin.x == x) + return; if (animate) { [moveAnimation_ stopAnimation]; |