Share Font Code for New Autofill.

chrome/browser/ui/gtk/autofill/autofill_popup_view_gtk.cc

 // Copyright (c) 2012 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 "autofill_popup_view_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
@@ skipping 43 matching lines @@
 
 // Height of the Autofill icons in pixels.
 const int kAutofillIconHeight = 16;
 
 // Width of the delete icon in pixels.
 const int kDeleteIconWidth = 16;
 
 // Height of the delete icon in pixels.
 const int kDeleteIconHeight = 16;
 
-// Size difference between value text and label text in pixels.
-const int kLabelFontSizeDelta = -2;
-
 gfx::Rect GetWindowRect(GdkWindow* window) {
   return gfx::Rect(gdk_window_get_width(window),
                    gdk_window_get_height(window));
 }
 
 int GetRowHeight(int unique_id) {
   if (unique_id == WebAutofillClient::MenuItemIDSeparator)
     return kSeparatorHeight;
 
   return kRowHeight;
@@ skipping 24 matching lines @@
                                  GDK_POINTER_MOTION_MASK);
   g_signal_connect(window_, "expose-event",
                    G_CALLBACK(HandleExposeThunk), this);
   g_signal_connect(window_, "leave-notify-event",
                    G_CALLBACK(HandleLeaveThunk), this);
   g_signal_connect(window_, "motion-notify-event",
                    G_CALLBACK(HandleMotionThunk), this);
   g_signal_connect(window_, "button-release-event",
                    G_CALLBACK(HandleButtonReleaseThunk), this);
 
-  label_font_ = value_font_.DeriveFont(kLabelFontSizeDelta);
-
   // Cache the layout so we don't have to create it for every expose.
   layout_ = gtk_widget_create_pango_layout(window_, NULL);
 }
 
 AutofillPopupViewGtk::~AutofillPopupViewGtk() {
   g_object_unref(layout_);
   gtk_widget_destroy(window_);
 }
 
 void AutofillPopupViewGtk::ShowInternal() {
@@ skipping 184 matching lines @@
                                              size_t index,
                                              const gfx::Rect& entry_rect) {
   if (selected_line() == static_cast<int>(index)) {
     gdk_cairo_set_source_color(cairo_context, &kHoveredBackgroundColor);
     cairo_rectangle(cairo_context, entry_rect.x(), entry_rect.y(),
                     entry_rect.width(), entry_rect.height());
     cairo_fill(cairo_context);
   }
 
   // Draw the value.
-  SetLayoutText(autofill_values()[index], value_font_, kValueTextColor);
-  int value_text_width = value_font_.GetStringWidth(autofill_values()[index]);
+  SetLayoutText(autofill_values()[index], value_font(), kValueTextColor);
+  int value_text_width = value_font().GetStringWidth(autofill_values()[index]);
 
   // Center the text within the line.
   int value_content_y = std::max(
       entry_rect.y(),
-      entry_rect.y() + ((kRowHeight - value_font_.GetHeight()) / 2));
+      entry_rect.y() + ((kRowHeight - value_font().GetHeight()) / 2));
 
   bool is_rtl = base::i18n::IsRTL();
   cairo_save(cairo_context);
   cairo_move_to(cairo_context,
                 is_rtl ? entry_rect.width() - value_text_width - kEndPadding :
                     kEndPadding,
                 value_content_y);
   pango_cairo_show_layout(cairo_context, layout_);
   cairo_restore(cairo_context);
 
@@ skipping 38 matching lines @@
                             window_,
                             *theme_service_->GetImageNamed(icon),
                             x_align_left,
                             icon_y);
     cairo_restore(cairo_context);
 
     x_align_left += is_rtl ? kAutofillIconWidth + kIconPadding : -kIconPadding;
   }
 
   // Draw the label text.
-  SetLayoutText(autofill_labels()[index], label_font_, kLabelTextColor);
+  SetLayoutText(autofill_labels()[index], label_font(), kLabelTextColor);
   x_align_left +=
-      is_rtl ? 0 : -label_font_.GetStringWidth(autofill_labels()[index]);
+      is_rtl ? 0 : -label_font().GetStringWidth(autofill_labels()[index]);
 
   // Center the text within the line.
   int label_content_y = std::max(
       entry_rect.y(),
-      entry_rect.y() + ((kRowHeight - label_font_.GetHeight()) / 2));
+      entry_rect.y() + ((kRowHeight - label_font().GetHeight()) / 2));
 
   cairo_save(cairo_context);
   cairo_move_to(cairo_context, x_align_left, label_content_y);
   pango_cairo_show_layout(cairo_context, layout_);
   cairo_restore(cairo_context);
 }
 
 void AutofillPopupViewGtk::SetBounds() {
   gint origin_x, origin_y;
   gdk_window_get_origin(gtk_widget_get_window(parent_), &origin_x, &origin_y);
@@ skipping 21 matching lines @@
       top_of_popup,
       GetPopupRequiredWidth(),
       popup_height);
 }
 
 int AutofillPopupViewGtk::GetPopupRequiredWidth() {
   int popup_width = element_bounds().width();
   DCHECK_EQ(autofill_values().size(), autofill_labels().size());
   for (size_t i = 0; i < autofill_values().size(); ++i) {
     int row_size = kEndPadding +
-        value_font_.GetStringWidth(autofill_values()[i]) +
+        value_font().GetStringWidth(autofill_values()[i]) +
         kLabelPadding +
-        label_font_.GetStringWidth(autofill_labels()[i]);
+        label_font().GetStringWidth(autofill_labels()[i]);
 
     // Add the Autofill icon size, if required.
     if (!autofill_icons()[i].empty())
       row_size += kAutofillIconWidth + kIconPadding;
 
     // Add delete icon, if required.
     if (CanDelete(autofill_unique_ids()[i]))
       row_size += kDeleteIconWidth + kIconPadding;
 
     // Add the padding at the end
@@ skipping 48 matching lines @@
   }
 
   gfx::Rect delete_icon_bounds = gfx::Rect(
       GetPopupRequiredWidth() - kDeleteIconWidth - kIconPadding,
       row_start_y + ((kRowHeight - kDeleteIconHeight) / 2),
       kDeleteIconWidth,
       kDeleteIconHeight);
 
   return delete_icon_bounds.Contains(x, y);
 }