Simplify the gtk location bar padding and make it more consistent.

chrome/browser/gtk/location_bar_view_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/location_bar_view_gtk.h"
 
 #include <string>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 30 matching lines @@
 // We draw a border on the top and bottom (but not on left or right).
 const int kBorderThickness = 1;
 
 // Left margin of first run bubble.
 const int kFirstRunBubbleLeftMargin = 8;
 // Extra vertical spacing for first run bubble.
 const int kFirstRunBubbleTopMargin = 1;
 // Task delay (in milliseconds) to show first run bubble.
 const int kFirstRunBubbleTaskDelay = 200;
 
-// Left and right padding/margin.
-// no icon/text  : 4px url_text 4px
-//                 [4px|url text|4px] <hide ssl icon> <hide ev text>
-// with icon     : 4px url_text 6px ssl_icon 8px
-//                 [4px|url text|4px] [2px|ssl icon|8px] <hide ev text>
-// with icon/text: 4px url_text 6px ssl_icon 8px ev_text 4px]
-//                 [4px|url text|4px] [2px|ssl icon|8px] [ev text|4px]
+// The padding around the top, bottom, and sides of the location bar hbox.
+// We don't want to edit control's text to be right against the edge,
+// as well the tab to search box and other widgets need to have the padding on
+// top and bottom to avoid drawing larger than the location bar space.
+const int kHboxBorder = 4;
 
-// We don't want to edit control's text to be right against the edge.
-const int kEditLeftRightPadding = 4;
-
-// Padding around the security icon.
-const int kSecurityIconPaddingLeft = 0;
-const int kSecurityIconPaddingRight = 6;
-
-const int kEvTextPaddingRight = 4;
-
-const int kKeywordTopBottomPadding = 4;
-const int kKeywordLeftRightPadding = 4;
+// Padding between the elements in the bar.
+static const int kInnerPadding = 4;
 
 // TODO(deanm): Eventually this should be painted with the background png
 // image, but for now we get pretty close by just drawing a solid border.
 const GdkColor kBorderColor = GDK_COLOR_RGB(0xbe, 0xc8, 0xd4);
 const GdkColor kEvTextColor = GDK_COLOR_RGB(0x00, 0x96, 0x14);  // Green.
 const GdkColor kKeywordBackgroundColor = GDK_COLOR_RGB(0xf0, 0xf4, 0xfa);
 const GdkColor kKeywordBorderColor = GDK_COLOR_RGB(0xcb, 0xde, 0xf7);
 
 // Size of the rounding of the "Search site for:" box.
 const int kCornerSize = 3;
@@ skipping 15 matching lines @@
 
 // static
 const GdkColor LocationBarViewGtk::kBackgroundColorByLevel[3] = {
   GDK_COLOR_RGB(255, 245, 195),  // SecurityLevel SECURE: Yellow.
   GDK_COLOR_RGB(255, 255, 255),  // SecurityLevel NORMAL: White.
   GDK_COLOR_RGB(255, 255, 255),  // SecurityLevel INSECURE: White.
 };
 
 LocationBarViewGtk::LocationBarViewGtk(CommandUpdater* command_updater,
     ToolbarModel* toolbar_model, AutocompletePopupPositioner* popup_positioner)
-    : security_icon_align_(NULL),
+    : security_icon_event_box_(NULL),
       security_lock_icon_image_(NULL),
       security_warning_icon_image_(NULL),
-      info_label_align_(NULL),
       info_label_(NULL),
-      tab_to_search_(NULL),
       tab_to_search_box_(NULL),
       tab_to_search_label_(NULL),
       tab_to_search_hint_(NULL),
       tab_to_search_hint_leading_label_(NULL),
       tab_to_search_hint_icon_(NULL),
       tab_to_search_hint_trailing_label_(NULL),
       profile_(NULL),
       command_updater_(command_updater),
       toolbar_model_(toolbar_model),
       popup_positioner_(popup_positioner),
@@ skipping 12 matching lines @@
 void LocationBarViewGtk::Init(bool popup_window_mode) {
   popup_window_mode_ = popup_window_mode;
   location_entry_.reset(new AutocompleteEditViewGtk(this,
                                                     toolbar_model_,
                                                     profile_,
                                                     command_updater_,
                                                     popup_window_mode_,
                                                     popup_positioner_));
   location_entry_->Init();
 
-  hbox_.Own(gtk_hbox_new(FALSE, 0));
+  hbox_.Own(gtk_hbox_new(FALSE, kInnerPadding));
+  gtk_container_set_border_width(GTK_CONTAINER(hbox_.get()), kHboxBorder);
   // We will paint for the alignment, to paint the background and border.
   gtk_widget_set_app_paintable(hbox_.get(), TRUE);
   // Have GTK double buffer around the expose signal.
   gtk_widget_set_double_buffered(hbox_.get(), TRUE);
   // Redraw the whole location bar when it changes size (e.g., when toggling
   // the home button on/off.
   gtk_widget_set_redraw_on_allocate(hbox_.get(), TRUE);
 
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   security_lock_icon_image_ = gtk_image_new_from_pixbuf(
       rb.GetPixbufNamed(IDR_LOCK));
   gtk_widget_hide(GTK_WIDGET(security_lock_icon_image_));
   security_warning_icon_image_ = gtk_image_new_from_pixbuf(
       rb.GetPixbufNamed(IDR_WARNING));
   gtk_widget_hide(GTK_WIDGET(security_warning_icon_image_));
 
   info_label_ = gtk_label_new(NULL);
   gtk_widget_modify_base(info_label_, GTK_STATE_NORMAL,
       &LocationBarViewGtk::kBackgroundColorByLevel[0]);
   gtk_widget_hide(GTK_WIDGET(info_label_));
 
   g_signal_connect(hbox_.get(), "expose-event",
                    G_CALLBACK(&HandleExposeThunk), this);
 
   // Tab to search (the keyword box on the left hand side).
   tab_to_search_label_ = gtk_label_new(NULL);
-  // We need an alignment to pad our box inside the edit area.
-  tab_to_search_ = gtk_alignment_new(0.0, 0.0, 1.0, 1.0);
-  gtk_alignment_set_padding(GTK_ALIGNMENT(tab_to_search_),
-      kKeywordTopBottomPadding, kKeywordTopBottomPadding,
-      kKeywordLeftRightPadding, kKeywordLeftRightPadding);
 
-  // This crazy stack of alignments and event boxes creates a box around the
-  // keyword text with a border, background color, and padding around the text.
+  // This creates a box around the keyword text with a border, background color,
+  // and padding around the text.
   tab_to_search_box_ = gtk_util::CreateGtkBorderBin(
       tab_to_search_label_, NULL, 1, 1, 2, 2);
   gtk_util::ActAsRoundedWindow(tab_to_search_box_, kBorderColor, kCornerSize,
                                gtk_util::ROUNDED_ALL, gtk_util::BORDER_ALL);
-  gtk_container_add(GTK_CONTAINER(tab_to_search_), tab_to_search_box_);
-  gtk_box_pack_start(GTK_BOX(hbox_.get()), tab_to_search_, FALSE, FALSE, 0);
+  gtk_box_pack_start(GTK_BOX(hbox_.get()), tab_to_search_box_, FALSE, FALSE, 0);
 
   GtkWidget* align = gtk_alignment_new(0.0, 0.0, 1.0, 1.0);
   // TODO(erg): Like in BrowserToolbarGtk, this used to have a code path on
   // construction for with GTK themes and without. Doing that only on
   // construction was wrong, and I can't see a difference between the two ways
   // anyway... Investigate more later.
   if (popup_window_mode_) {
     gtk_alignment_set_padding(GTK_ALIGNMENT(align),
                               kTopMargin + kBorderThickness,
                               kBottomMargin + kBorderThickness,
-                              kEditLeftRightPadding + kBorderThickness,
-                              kEditLeftRightPadding + kBorderThickness);
+                              kBorderThickness,
+                              kBorderThickness);
   } else {
     gtk_alignment_set_padding(GTK_ALIGNMENT(align),
                               kTopMargin + kBorderThickness,
                               kBottomMargin + kBorderThickness,
-                              kEditLeftRightPadding, kEditLeftRightPadding);
+                              0, 0);
   }
   gtk_container_add(GTK_CONTAINER(align), location_entry_->widget());
   gtk_box_pack_start(GTK_BOX(hbox_.get()), align, TRUE, TRUE, 0);
 
   // Tab to search notification (the hint on the right hand side).
   tab_to_search_hint_ = gtk_hbox_new(FALSE, 0);
   tab_to_search_hint_leading_label_ = gtk_label_new(NULL);
   tab_to_search_hint_icon_ = gtk_image_new_from_pixbuf(
       rb.GetPixbufNamed(IDR_LOCATION_BAR_KEYWORD_HINT_TAB));
   tab_to_search_hint_trailing_label_ = gtk_label_new(NULL);
   gtk_box_pack_start(GTK_BOX(tab_to_search_hint_),
                      tab_to_search_hint_leading_label_,
                      FALSE, FALSE, 0);
   gtk_box_pack_start(GTK_BOX(tab_to_search_hint_),
                      tab_to_search_hint_icon_,
                      FALSE, FALSE, 0);
   gtk_box_pack_start(GTK_BOX(tab_to_search_hint_),
                      tab_to_search_hint_trailing_label_,
                      FALSE, FALSE, 0);
   // tab_to_search_hint_ gets hidden initially in OnChanged.  Hiding it here
   // doesn't work, someone is probably calling show_all on our parent box.
   gtk_box_pack_end(GTK_BOX(hbox_.get()), tab_to_search_hint_, FALSE, FALSE, 4);
 
   // Pack info_label_ and security icons in hbox.  We hide/show them
   // by SetSecurityIcon() and SetInfoText().
-  info_label_align_ = gtk_alignment_new(0.0, 0.0, 1.0, 1.0);
-  gtk_alignment_set_padding(GTK_ALIGNMENT(info_label_align_),
-                            kTopMargin + kBorderThickness,
-                            kBottomMargin + kBorderThickness,
-                            0, kEvTextPaddingRight);
-  gtk_container_add(GTK_CONTAINER(info_label_align_), info_label_);
-  gtk_box_pack_end(GTK_BOX(hbox_.get()), info_label_align_, FALSE, FALSE, 0);
+  gtk_box_pack_end(GTK_BOX(hbox_.get()), info_label_, FALSE, FALSE, 0);
 
   GtkWidget* security_icon_box = gtk_hbox_new(FALSE, 0);
   gtk_box_pack_start(GTK_BOX(security_icon_box),
                      security_lock_icon_image_, FALSE, FALSE, 0);
   gtk_box_pack_start(GTK_BOX(security_icon_box),
                      security_warning_icon_image_, FALSE, FALSE, 0);
 
-  security_icon_align_ = gtk_alignment_new(0.0, 0.0, 1.0, 1.0);
-  gtk_alignment_set_padding(GTK_ALIGNMENT(security_icon_align_),
-                            kTopMargin + kBorderThickness,
-                            kBottomMargin + kBorderThickness,
-                            kSecurityIconPaddingLeft,
-                            kSecurityIconPaddingRight);
   // GtkImage is a "no window" widget and requires a GtkEventBox to receive
   // events.
-  GtkWidget* event_box = gtk_event_box_new();
+  security_icon_event_box_ = gtk_event_box_new();
   // Make the event box not visible so it does not paint a background.
-  gtk_event_box_set_visible_window(GTK_EVENT_BOX(event_box), FALSE);
-  g_signal_connect(event_box, "button-press-event",
+  gtk_event_box_set_visible_window(GTK_EVENT_BOX(security_icon_event_box_),
+                                   FALSE);
+  g_signal_connect(security_icon_event_box_, "button-press-event",
                    G_CALLBACK(&OnSecurityIconPressed), this);
 
-  gtk_container_add(GTK_CONTAINER(event_box), security_icon_box);
-  gtk_container_add(GTK_CONTAINER(security_icon_align_), event_box);
-  gtk_box_pack_end(GTK_BOX(hbox_.get()), security_icon_align_, FALSE, FALSE, 0);
+  gtk_container_add(GTK_CONTAINER(security_icon_event_box_), security_icon_box);
+  gtk_box_pack_end(GTK_BOX(hbox_.get()), security_icon_event_box_,
+                   FALSE, FALSE, 0);
 
   registrar_.Add(this,
                  NotificationType::BROWSER_THEME_CHANGED,
                  NotificationService::AllSources());
   theme_provider_ = GtkThemeProvider::GetFrom(profile_);
   theme_provider_->InitThemesFor(this);
 }
 
 void LocationBarViewGtk::SetProfile(Profile* profile) {
   profile_ = profile;
@@ skipping 49 matching lines @@
 }
 
 void LocationBarViewGtk::OnChanged() {
   const std::wstring keyword(location_entry_->model()->keyword());
   const bool is_keyword_hint = location_entry_->model()->is_keyword_hint();
   const bool show_selected_keyword = !keyword.empty() && !is_keyword_hint;
   const bool show_keyword_hint = !keyword.empty() && is_keyword_hint;
 
   if (show_selected_keyword) {
     SetKeywordLabel(keyword);
-    gtk_widget_show_all(tab_to_search_);
+    gtk_widget_show_all(tab_to_search_box_);
   } else {
-    gtk_widget_hide_all(tab_to_search_);
+    gtk_widget_hide_all(tab_to_search_box_);
   }
 
   if (show_keyword_hint) {
     SetKeywordHintLabel(keyword);
     gtk_widget_show_all(tab_to_search_hint_);
   } else {
     gtk_widget_hide_all(tab_to_search_hint_);
   }
 }
 
@@ skipping 164 matching lines @@
     g_object_unref(gc);
   }
 
   return FALSE;  // Continue propagating the expose.
 }
 
 void LocationBarViewGtk::SetSecurityIcon(ToolbarModel::Icon icon) {
   gtk_widget_hide(GTK_WIDGET(security_lock_icon_image_));
   gtk_widget_hide(GTK_WIDGET(security_warning_icon_image_));
   if (icon != ToolbarModel::NO_ICON)
-    gtk_widget_show(GTK_WIDGET(security_icon_align_));
+    gtk_widget_show(GTK_WIDGET(security_icon_event_box_));
   else
-    gtk_widget_hide(GTK_WIDGET(security_icon_align_));
+    gtk_widget_hide(GTK_WIDGET(security_icon_event_box_));
   switch (icon) {
     case ToolbarModel::LOCK_ICON:
       gtk_widget_show(GTK_WIDGET(security_lock_icon_image_));
       break;
     case ToolbarModel::WARNING_ICON:
       gtk_widget_show(GTK_WIDGET(security_warning_icon_image_));
       break;
     case ToolbarModel::NO_ICON:
       break;
     default:
       NOTREACHED();
       break;
   }
 }
 
 void LocationBarViewGtk::SetInfoText() {
   std::wstring info_text, info_tooltip;
   ToolbarModel::InfoTextType info_text_type =
       toolbar_model_->GetInfoText(&info_text, &info_tooltip);
   if (info_text_type == ToolbarModel::INFO_EV_TEXT) {
     gtk_widget_modify_fg(GTK_WIDGET(info_label_), GTK_STATE_NORMAL,
                          &kEvTextColor);
-    gtk_widget_show(GTK_WIDGET(info_label_align_));
+    gtk_widget_show(GTK_WIDGET(info_label_));
   } else {
     DCHECK_EQ(info_text_type, ToolbarModel::INFO_NO_INFO);
     DCHECK(info_text.empty());
     // Clear info_text.  Should we reset the fg here?
-    gtk_widget_hide(GTK_WIDGET(info_label_align_));
+    gtk_widget_hide(GTK_WIDGET(info_label_));
   }
   gtk_label_set_text(GTK_LABEL(info_label_), WideToUTF8(info_text).c_str());
   gtk_widget_set_tooltip_text(GTK_WIDGET(info_label_),
                               WideToUTF8(info_tooltip).c_str());
 }
 
 void LocationBarViewGtk::SetKeywordLabel(const std::wstring& keyword) {
   if (keyword.empty())
     return;
 
@@ skipping 68 matching lines @@
     LocationBarViewGtk* location_bar) {
   TabContents* tab = BrowserList::GetLastActive()->GetSelectedTabContents();
   NavigationEntry* nav_entry = tab->controller().GetActiveEntry();
   if (!nav_entry) {
     NOTREACHED();
     return true;
   }
   tab->ShowPageInfo(nav_entry->url(), nav_entry->ssl(), true);
   return true;
 }