diff options
| -rw-r--r-- | chrome/browser/gtk/browser_actions_toolbar_gtk.cc | 7 | ||||
| -rw-r--r-- | chrome/browser/views/browser_actions_container.cc | 10 |
2 files changed, 15 insertions, 2 deletions
diff --git a/chrome/browser/gtk/browser_actions_toolbar_gtk.cc b/chrome/browser/gtk/browser_actions_toolbar_gtk.cc index 74b46c2..b30d053 100644 --- a/chrome/browser/gtk/browser_actions_toolbar_gtk.cc +++ b/chrome/browser/gtk/browser_actions_toolbar_gtk.cc @@ -27,6 +27,11 @@ // The size of each button on the toolbar. static const int kButtonSize = 29; +// The padding between browser action buttons. Visually, the actual number of +// "empty" (non-drawing) pixels is this value + 2 when adjacent browser icons +// use their maximum allowed size. +static const int kBrowserActionButtonPadding = 3; + class BrowserActionButton : public NotificationObserver, public ImageLoadingTracker::Observer { public: @@ -178,7 +183,7 @@ class BrowserActionButton : public NotificationObserver, BrowserActionsToolbarGtk::BrowserActionsToolbarGtk(Browser* browser) : browser_(browser), profile_(browser->profile()), - hbox_(gtk_hbox_new(0, FALSE)) { + hbox_(gtk_hbox_new(FALSE, kBrowserActionButtonPadding)) { ExtensionsService* extension_service = profile_->GetExtensionsService(); registrar_.Add(this, NotificationType::EXTENSION_LOADED, Source<ExtensionsService>(extension_service)); diff --git a/chrome/browser/views/browser_actions_container.cc b/chrome/browser/views/browser_actions_container.cc index 5dbf6ad..d21984b 100644 --- a/chrome/browser/views/browser_actions_container.cc +++ b/chrome/browser/views/browser_actions_container.cc @@ -30,6 +30,11 @@ static const int kButtonSize = 29; // The padding between the browser actions and the omnibox/page menu. static const int kHorizontalPadding = 4; +// The padding between browser action buttons. Visually, the actual number of +// empty (non-drawing) pixels is this value + 2 when adjacent browser icons +// use their maximum allowed size. +static const int kBrowserActionButtonPadding = 3; + // This is the same value from toolbar.cc. We position the browser actions // container flush with the edges of the toolbar as a special case so that we // can draw the badge outside the visual bounds of the container. @@ -340,13 +345,16 @@ gfx::Size BrowserActionsContainer::GetPreferredSize() { return gfx::Size(0, 0); int width = kHorizontalPadding * 2 + browser_action_views_.size() * kButtonSize; + if (browser_action_views_.size() > 1) + width += (browser_action_views_.size() - 1) * kBrowserActionButtonPadding; return gfx::Size(width, kButtonSize); } void BrowserActionsContainer::Layout() { for (size_t i = 0; i < browser_action_views_.size(); ++i) { BrowserActionView* view = browser_action_views_[i]; - int x = kHorizontalPadding + i * kButtonSize; + int x = kHorizontalPadding + + i * (kButtonSize + kBrowserActionButtonPadding); if (x + kButtonSize <= width()) { view->SetBounds(x, 0, kButtonSize, height()); view->SetVisible(true); |