Add textfield internal padding from FocusableBorder.

ui/app_list/views/folder_header_view.cc

 // Copyright (c) 2013 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/app_list/views/folder_header_view.h"
 
 #include <algorithm>
 
 #include "base/strings/utf_string_conversions.h"
 #include "ui/app_list/app_list_constants.h"
@@ skipping 149 matching lines @@
   gfx::Rect back_bounds(rect);
   back_bounds.set_width(kIconDimension + 2 * kPadding);
   back_button_->SetBoundsRect(back_bounds);
 
   gfx::Rect text_bounds(rect);
   base::string16 text = folder_item_ && !folder_item_->name().empty()
                             ? base::UTF8ToUTF16(folder_item_->name())
                             : folder_name_placeholder_text_;
   int text_width =
       gfx::Canvas::GetStringWidth(text, folder_name_view_->GetFontList()) +
-      folder_name_view_->GetCaretBounds().width();
+      folder_name_view_->GetCaretBounds().width() +
+      2 * views::Textfield::kTextPadding;

[Peter Kasting, 2014/09/05 22:56:49]

Can this be calculated by setting |folder_name_view_|'s text and then using
GetPreferredSize(), or something?

[msw, 2014/09/05 23:46:55]

The preferred size of a textfield does not depend on its content, and
surprisingly enough to me, textfield does not offer a way to get the size of the
text content. Really, the right way to fix this is to use a textfield with
centered horizontal alignment and static bounds. I tried that, but the
placeholder text and cursor are not properly placed for centered textfields
(which aren't common). I'll keep that work in mind for the future (we want to
clobber gfx::Canvas::GetStringWidth where possible anyway).

   text_width = std::min(text_width, kMaxFolderNameWidth);
   text_bounds.set_x(back_bounds.x() + (rect.width() - text_width) / 2);
   text_bounds.set_width(text_width);
   text_bounds.ClampToCenteredSize(gfx::Size(text_bounds.width(),
       folder_name_view_->GetPreferredSize().height()));
   folder_name_view_->SetBoundsRect(text_bounds);
 }
 
 bool FolderHeaderView::OnKeyPressed(const ui::KeyEvent& event) {
   if (event.key_code() == ui::VKEY_RETURN)
@@ skipping 39 matching lines @@
 void FolderHeaderView::ButtonPressed(views::Button* sender,
                                      const ui::Event& event) {
   delegate_->NavigateBack(folder_item_, event);
 }
 
 void FolderHeaderView::ItemNameChanged() {
   Update();
 }
 
 }  // namespace app_list