diff options
| author | andybons@chromium.org <andybons@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-31 23:28:41 +0000 |
|---|---|---|
| committer | andybons@chromium.org <andybons@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-31 23:28:41 +0000 |
| commit | 98940fdf0611aa314b1a1f5511676a3726c7297d (patch) | |
| tree | 308cab7fcac55a6aa2ef6bc7d3957d5d7da39e8d /chrome/browser/cocoa/toolbar_controller.mm | |
| parent | e67ced4317b42834974c31672bdc1b154f569b28 (diff) | |
| download | chromium_src-98940fdf0611aa314b1a1f5511676a3726c7297d.zip chromium_src-98940fdf0611aa314b1a1f5511676a3726c7297d.tar.gz chromium_src-98940fdf0611aa314b1a1f5511676a3726c7297d.tar.bz2 | |
[Mac] Prep for animating the Browser Action Buttons in and out.
Also fixes bug where the go button would overlap with the page/wrench menus upon uninstalling the last extension.
BUG=40003,39200
TEST=none
Review URL: http://codereview.chromium.org/1551009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43282 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/toolbar_controller.mm')
| -rw-r--r-- | chrome/browser/cocoa/toolbar_controller.mm | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/chrome/browser/cocoa/toolbar_controller.mm b/chrome/browser/cocoa/toolbar_controller.mm index 68819f1..7a75fe7 100644 --- a/chrome/browser/cocoa/toolbar_controller.mm +++ b/chrome/browser/cocoa/toolbar_controller.mm @@ -671,7 +671,8 @@ class PrefObserverBridge : public NotificationObserver { } - (void)browserActionsVisibilityChanged:(NSNotification*)notification { - [self pinGoButtonToLeftOfBrowserActionsContainerAndAnimate:NO]; + [self pinGoButtonToLeftOfBrowserActionsContainerAndAnimate: + [[[self view] window] isVisible]]; } - (void)pinGoButtonToLeftOfBrowserActionsContainerAndAnimate:(BOOL)animate { @@ -679,7 +680,9 @@ class PrefObserverBridge : public NotificationObserver { CGFloat leftPadding; if ([browserActionsContainerView_ isHidden]) { - leftPadding = NSWidth([[goButton_ window] frame]) - goXPos; + CGFloat edgeXPos = [pageButton_ isHidden] ? + NSWidth([[goButton_ window] frame]) : [pageButton_ frame].origin.x; + leftPadding = edgeXPos - goXPos; } else { NSRect containerFrame = animate ? [browserActionsContainerView_ animationEndFrame] : |