Control spacing of toolbar elements with pixels rather than " " GtkLabels....

chrome/browser/gtk/browser_toolbar_gtk.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/gtk/browser_toolbar_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 19 matching lines @@
 #include "chrome/common/pref_service.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 
 namespace {
 
 // Height of the toolbar in pixels.
 const int kToolbarHeight = 37;
 
+// Interior spacing between toolbar buttons (for those that have any spacing).
+const int kButtonSpacing = 6;
+
 // The amount of space between the bottom of the star and the top of the
 // Omnibox results popup window.  We want a two pixel space between the bottom
 // and the results, but have some extra space below the buttons already.
 const int kPopupTopMargin = 0;
 
 // Space between the edge of the star/go button and the popup frame.  We want
 // to leave 1 pixel on both side here so that the borders line up.
 const int kPopupLeftRightMargin = 1;
 
 }  // namespace
@@ skipping 53 matching lines @@
   back_.reset(new BackForwardButtonGtk(browser_, false));
   gtk_box_pack_start(GTK_BOX(toolbar_), back_->widget(), FALSE, FALSE, 0);
   AddAcceleratorToButton(back_->widget(), GDK_Left, GDK_MOD1_MASK);
   AddAcceleratorToButton(back_->widget(), GDK_BackSpace, 0);
 
   forward_.reset(new BackForwardButtonGtk(browser_, true));
   gtk_box_pack_start(GTK_BOX(toolbar_), forward_->widget(), FALSE, FALSE, 0);
   AddAcceleratorToButton(forward_->widget(), GDK_Right, GDK_MOD1_MASK);
   AddAcceleratorToButton(forward_->widget(), GDK_BackSpace, GDK_SHIFT_MASK);
 
-  // TODO(estade): These blank labels will change size when the user changes
-  // system font size. We should hard code their size in pixels.
-  gtk_box_pack_start(GTK_BOX(toolbar_), gtk_label_new(" "), FALSE, FALSE, 0);
-
   reload_.reset(BuildToolbarButton(IDR_RELOAD, IDR_RELOAD_P, IDR_RELOAD_H, 0,
-      l10n_util::GetStringUTF8(IDS_TOOLTIP_RELOAD)));
+      l10n_util::GetStringUTF8(IDS_TOOLTIP_RELOAD), kButtonSpacing));
   AddAcceleratorToButton(reload_->widget(),
                          GDK_r, GDK_CONTROL_MASK);
   // Any modifier except alt can be combined with f5 (this matches windows
   // chromium).
   AddAcceleratorToButton(reload_->widget(),
                          GDK_F5, GDK_MODIFIER_MASK & ~GDK_MOD1_MASK);
 
   // TODO(port): we need to dynamically react to changes in show_home_button_
   // and hide/show home appropriately.  But we don't have a UI for it yet.
   if (*show_home_button_)
     home_.reset(MakeHomeButton());
 
-  gtk_box_pack_start(GTK_BOX(toolbar_), gtk_label_new("  "), FALSE, FALSE, 0);
-
   star_.reset(BuildStarButton(l10n_util::GetStringUTF8(IDS_TOOLTIP_STAR)));
 
   location_bar_->Init();
   gtk_box_pack_start(GTK_BOX(toolbar_), location_bar_->widget(), TRUE, TRUE, 0);
 
   go_.reset(new GoButtonGtk(location_bar_.get(), browser_));
   gtk_box_pack_start(GTK_BOX(toolbar_), go_->widget(), FALSE, FALSE, 0);
 
-  gtk_box_pack_start(GTK_BOX(toolbar_), gtk_label_new(" "), FALSE, FALSE, 0);
+  GtkWidget* spacing = gtk_label_new("");
+  gtk_widget_set_size_request(spacing, kButtonSpacing, -1);
+  gtk_box_pack_start(GTK_BOX(toolbar_), spacing, FALSE, FALSE, 0);
 
   BuildToolbarMenuButton(IDR_MENU_PAGE,
       l10n_util::GetStringUTF8(IDS_PAGEMENU_TOOLTIP),
       &page_menu_button_);
   page_menu_.reset(new MenuGtk(this, GetStandardPageMenu(), accel_group_));
 
   BuildToolbarMenuButton(IDR_MENU_CHROME,
       l10n_util::GetStringFUTF8(IDS_APPMENU_TOOLTIP,
           WideToUTF16(l10n_util::GetString(IDS_PRODUCT_NAME))),
       &app_menu_button_);
@@ skipping 118 matching lines @@
   star_y += star->allocation.y + star->allocation.height;  // Bottom edge.
 
   return gfx::Rect(star_x + kPopupLeftRightMargin, star_y + kPopupTopMargin,
                    go_x - star_x - (2 * kPopupLeftRightMargin), 0);
 }
 
 // BrowserToolbarGtk, private --------------------------------------------------
 
 CustomDrawButton* BrowserToolbarGtk::BuildToolbarButton(
     int normal_id, int active_id, int highlight_id, int depressed_id,
-    const std::string& localized_tooltip) {
+    const std::string& localized_tooltip, int spacing) {
   CustomDrawButton* button = new CustomDrawButton(normal_id, active_id,
       highlight_id, depressed_id);
 
   gtk_widget_set_tooltip_text(button->widget(),
                               localized_tooltip.c_str());
   g_signal_connect(button->widget(), "clicked",
                    G_CALLBACK(OnButtonClick), this);
 
-  gtk_box_pack_start(GTK_BOX(toolbar_), button->widget(), FALSE, FALSE, 0);
+  gtk_box_pack_start(GTK_BOX(toolbar_), button->widget(), FALSE, FALSE,
+                     spacing);
   return button;
 }
 
 ToolbarStarToggleGtk* BrowserToolbarGtk::BuildStarButton(
     const std::string& localized_tooltip) {
   ToolbarStarToggleGtk* button = new ToolbarStarToggleGtk;
 
   gtk_widget_set_tooltip_text(button->widget(),
                               localized_tooltip.c_str());
   g_signal_connect(button->widget(), "clicked",
@@ skipping 77 matching lines @@
     GtkWidget* widget,
     unsigned int accelerator,
     unsigned int accelerator_mod) {
   gtk_widget_add_accelerator(
       widget, "clicked", accel_group_, accelerator,
       GdkModifierType(accelerator_mod), GtkAccelFlags(0));
 }
 
 CustomDrawButton* BrowserToolbarGtk::MakeHomeButton() {
   return BuildToolbarButton(IDR_HOME, IDR_HOME_P, IDR_HOME_H, 0,
-                            l10n_util::GetStringUTF8(IDS_TOOLTIP_HOME));
+                            l10n_util::GetStringUTF8(IDS_TOOLTIP_HOME), 0);
 }
 
 void BrowserToolbarGtk::InitNineBox() {
   // TODO(estade): use |profile_|?
   background_ninebox_.reset(new NineBox(
       browser_->profile()->GetThemeProvider(),
       0, IDR_THEME_TOOLBAR, 0, 0, 0, 0, 0, 0, 0));
 }