Add textfield internal padding from FocusableBorder.

ui/views/controls/combobox/combobox.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 "ui/views/controls/combobox/combobox.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 14 matching lines @@
 #include "ui/views/color_constants.h"
 #include "ui/views/controls/button/custom_button.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/combobox/combobox_listener.h"
 #include "ui/views/controls/focusable_border.h"
 #include "ui/views/controls/menu/menu_item_view.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/controls/menu/menu_runner_handler.h"
 #include "ui/views/controls/menu/submenu_view.h"
 #include "ui/views/controls/prefix_selector.h"
+#include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/ime/input_method.h"
 #include "ui/views/mouse_constants.h"
 #include "ui/views/painter.h"
 #include "ui/views/widget/widget.h"
 
 namespace views {
 
 namespace {
 
 // Menu border widths
@@ skipping 358 matching lines @@
                                            model()->GetItemAt(row);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Combobox, View overrides:
 
 gfx::Size Combobox::GetPreferredSize() const {
   // The preferred size will drive the local bounds which in turn is used to set
   // the minimum width for the dropdown list.
   gfx::Insets insets = GetInsets();
+  insets += gfx::Insets(Textfield::kTextPadding, Textfield::kTextPadding,
+                        Textfield::kTextPadding, Textfield::kTextPadding);
   int total_width = std::max(kMinComboboxWidth, content_size_.width()) +
       insets.width() + GetDisclosureArrowLeftPadding() +
       ArrowSize().width() + GetDisclosureArrowRightPadding();
   return gfx::Size(total_width, content_size_.height() + insets.height());
 }
 
 const char* Combobox::GetClassName() const {
   return kViewClassName;
 }
 
@@ skipping 198 matching lines @@
     if (style_ != STYLE_ACTION || i == selected_index_)
       width = std::max(width, gfx::GetStringWidth(text, font_list));
   }
 
   content_size_.SetSize(width, font_list.GetHeight());
 }
 
 void Combobox::UpdateBorder() {
   scoped_ptr<FocusableBorder> border(new FocusableBorder());
   if (style_ == STYLE_ACTION)
-    border->SetInsets(8, 13, 8, 13);
+    border->SetInsets(5, 10, 5, 10);

[Peter Kasting, 2014/08/29 21:09:11]

Should we be doing something like "8 - Textfield::kTextPadding" here?  Or do we
always want 5/10 px of additional inset if we change the textfield padding
amount in the future?

[msw, 2014/08/30 00:17:48]

I don't think the intent is clear, so I figured I wouldn't complicate the code.
(Combobox should eventually be a MenuButton or match LabelButton height.)

   if (invalid_)
     border->SetColor(kWarningColor);
   SetBorder(border.PassAs<Border>());
 }
 
 void Combobox::AdjustBoundsForRTLUI(gfx::Rect* rect) const {
   rect->set_x(GetMirroredXForRect(*rect));
 }
 
 void Combobox::PaintText(gfx::Canvas* canvas) {
   gfx::Insets insets = GetInsets();
+  insets += gfx::Insets(0, Textfield::kTextPadding, 0, Textfield::kTextPadding);
 
   gfx::ScopedCanvas scoped_canvas(canvas);
   canvas->ClipRect(GetContentsBounds());
 
   int x = insets.left();
   int y = insets.top();
   int text_height = height() - insets.height();
   SkColor text_color = GetNativeTheme()->GetSystemColor(
       ui::NativeTheme::kColorId_LabelEnabledColor);
 
@@ skipping 200 matching lines @@
   const ui::NativeTheme* native_theme_for_arrow = GetNativeTheme();
 #endif
 
   ui::NativeTheme::ExtraParams ignored;
   return native_theme_for_arrow->GetPartSize(ui::NativeTheme::kComboboxArrow,
                                              ui::NativeTheme::kNormal,
                                              ignored);
 }
 
 }  // namespace views