summaryrefslogtreecommitdiffstats
path: root/chrome/browser/cocoa/toolbar_controller.mm
diff options
context:
space:
mode:
authorandybons@chromium.org <andybons@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-16 20:40:58 +0000
committerandybons@chromium.org <andybons@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-16 20:40:58 +0000
commit96ddbad4b9d20530bea3d5b22146634199f93ed1 (patch)
tree8febafd80dc442d231595683df920a26569ef351 /chrome/browser/cocoa/toolbar_controller.mm
parentce8ecfa68eb910eb86873c564fc83bd6d4d210be (diff)
downloadchromium_src-96ddbad4b9d20530bea3d5b22146634199f93ed1.zip
chromium_src-96ddbad4b9d20530bea3d5b22146634199f93ed1.tar.gz
chromium_src-96ddbad4b9d20530bea3d5b22146634199f93ed1.tar.bz2
[Mac] Toolbar UI tweaks.
o 4px between wrench menu and location bar/edge of window. o 4px between reload button and location bar. o Adjust size of wrench menu to be the same size as every other button. o Fix bug where location bar would be too close to the wrench menu when disabling the last visible browser action. BUG=46738,48678 TEST=visual Review URL: http://codereview.chromium.org/3027005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52738 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/toolbar_controller.mm')
-rw-r--r--chrome/browser/cocoa/toolbar_controller.mm5
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/cocoa/toolbar_controller.mm b/chrome/browser/cocoa/toolbar_controller.mm
index 44f3aaf..cfa75f9 100644
--- a/chrome/browser/cocoa/toolbar_controller.mm
+++ b/chrome/browser/cocoa/toolbar_controller.mm
@@ -67,6 +67,9 @@ const CGFloat kMinimumLocationBarWidth = 100.0;
// The duration of any animation that occurs within the toolbar in seconds.
const CGFloat kAnimationDuration = 0.2;
+// The amount of left padding that the wrench menu should have.
+const CGFloat kWrenchMenuLeftPadding = 3.0;
+
} // namespace
@interface ToolbarController(Private)
@@ -593,7 +596,7 @@ class PrefObserverBridge : public NotificationObserver {
if ([browserActionsContainerView_ isHidden]) {
CGFloat edgeXPos = [wrenchButton_ frame].origin.x;
- leftDistance = edgeXPos - locationBarXPos;
+ leftDistance = edgeXPos - locationBarXPos - kWrenchMenuLeftPadding;
} else {
NSRect containerFrame = animate ?
[browserActionsContainerView_ animationEndFrame] :