Add textfield internal padding from FocusableBorder.

ui/views/controls/textfield/textfield.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/textfield/textfield.h"
 
 #include <string>
 
 #include "base/debug/trace_event.h"
 #include "ui/accessibility/ax_view_state.h"
@@ skipping 258 matching lines @@
       skip_input_method_cancel_composition_(false),
       cursor_visible_(false),
       drop_cursor_visible_(false),
       initiating_drag_(false),
       aggregated_clicks_(0),
       drag_start_display_offset_(0),
       touch_handles_hidden_due_to_scroll_(false),
       weak_ptr_factory_(this) {
   set_context_menu_controller(this);
   set_drag_controller(this);
-  SetBorder(scoped_ptr<Border>(new FocusableBorder()));
   SetFocusable(true);
 
+  // Use most of the FocusableBorder's internal padding for text rendering.

[Peter Kasting, 2014/08/28 21:15:37]

Why not just make FocusableBorder thinner?

[msw, 2014/08/28 21:29:14]

That would be a good next step to give Combobox and DecoratedTextfield (the
other FocusableBorder users) more vertical space for their content, but I think
incremental fixes would be better for merging to M-38.

FYI, DecoratedTextfield does not have the same defect (it uses a taller custom
height for design reasons), but Combobox does. Other controls have similar
defects, including the find bar textfield, and menu items, and various labels.

+  scoped_ptr<FocusableBorder> border(new FocusableBorder());
+  const int kVerticalInset = border->GetMinimumSize().height() / 2;
+  const gfx::Insets insets(border->GetInsets());
+  border->SetInsets(kVerticalInset, insets.left(),
+                    kVerticalInset, insets.right());
+  SetBorder(border.PassAs<Border>());
+  internal_padding_ = gfx::Insets(insets.top() - kVerticalInset, 0,
+                                  insets.bottom() - kVerticalInset, 0);
+
   if (ViewsDelegate::views_delegate) {
     password_reveal_duration_ = ViewsDelegate::views_delegate->
         GetDefaultTextfieldObscuredRevealDuration();
   }
 }
 
 Textfield::~Textfield() {}
 
 void Textfield::SetReadOnly(bool read_only) {
   // Update read-only without changing the focusable state (or active, etc.).
@@ skipping 256 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Textfield, View overrides:
 
 int Textfield::GetBaseline() const {
   return GetInsets().top() + GetRenderText()->GetBaseline();
 }
 
 gfx::Size Textfield::GetPreferredSize() const {
-  const gfx::Insets& insets = GetInsets();
+  gfx::Insets insets = GetInsets();
+  insets += internal_padding_;
   return gfx::Size(GetFontList().GetExpectedTextWidth(default_width_in_chars_) +
                    insets.width(), GetFontList().GetHeight() + insets.height());
 }
 
+void Textfield::SetBorder(scoped_ptr<Border> b) {
+  // Clear the default internal padding if a custom border is used.
+  internal_padding_ = gfx::Insets();
+  View::SetBorder(b.Pass());
+}
+
 const char* Textfield::GetClassName() const {
   return kViewClassName;
 }
 
 gfx::NativeCursor Textfield::GetCursor(const ui::MouseEvent& event) {
   bool in_selection = GetRenderText()->IsPointInSelection(event.location());
   bool drag_event = event.type() == ui::ET_MOUSE_DRAGGED;
   bool text_cursor = !initiating_drag_ && (drag_event || !in_selection);
   return text_cursor ? GetNativeIBeamCursor() : gfx::kNullCursor;
 }
@@ skipping 1219 matching lines @@
       const size_t length = selection_clipboard_text.length();
       range = gfx::Range(range.start() + length, range.end() + length);
     }
     model_->MoveCursorTo(gfx::SelectionModel(range, affinity));
     UpdateAfterChange(true, true);
     OnAfterUserAction();
   }
 }
 
 }  // namespace views