Add textfield internal padding from FocusableBorder.

chrome/browser/ui/views/find_bar_view.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 "chrome/browser/ui/views/find_bar_view.h"
 
 #include <algorithm>
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
@@ skipping 307 matching lines @@
   sz.SetToMax(gfx::Size(kMatchCountMinWidth, 0));
   int match_count_x =
       find_previous_button_->x() - kMarginRightOfMatchCountLabel - sz.width();
   int find_text_y = (height() - find_text_->GetPreferredSize().height()) / 2;
   match_count_text_->SetBounds(match_count_x,
                                find_text_y + find_text_->GetBaseline() -
                                    match_count_text_->GetBaseline(),
                                sz.width(), sz.height());
 
   // And whatever space is left in between, gets filled up by the find edit box.
-  int find_text_width = std::max(0, match_count_x -
-      kMarginLeftOfMatchCountLabel - kMarginLeftOfFindTextfield);
-  find_text_->SetBounds(kMarginLeftOfFindTextfield, find_text_y,
-      find_text_width, find_text_->GetPreferredSize().height());
+  int left_margin = kMarginLeftOfFindTextfield - views::Textfield::kTextPadding;

[Peter Kasting, 2014/08/30 00:46:42]

The changes here and below look like they only account for the textfield padding
at the left edge.  What about the padding at the right?  Shouldn't that be taken
out of kMarginLeftOfMatchCountLabel?

[msw, 2014/09/04 01:25:51]

Done, but that necessitates increasing kMarginLeftOfMatchCountLabel from 2px to
3px, otherwise the textfield and match count label bounds overlap. (as we
discussed, this seems preferable to ensuring a painting z-order, and we
apparently want ~3px of padding around textfield text anyway).

+  int find_text_width =
+      std::max(0, match_count_x - left_margin - kMarginLeftOfMatchCountLabel);
+  find_text_->SetBounds(left_margin, find_text_y, find_text_width,
+                        find_text_->GetPreferredSize().height());
 
   // The focus forwarder view is a hidden view that should cover the area
   // between the find text box and the find button so that when the user clicks
   // in that area we focus on the find text box.
   int find_text_edge = find_text_->x() + find_text_->width();
   focus_forwarder_view_->SetBounds(
       find_text_edge, find_previous_button_->y(),
       find_previous_button_->x() - find_text_edge,
       find_previous_button_->height());
 }
 
 gfx::Size FindBarView::GetPreferredSize() const {

[Peter Kasting, 2014/08/30 00:46:42]

It surprises me that this function doesn't seem to handle the match count label
at all.

[msw, 2014/09/04 01:25:51]

The match count label is initially not shown and its preferred size changes with
the length of the "XXX of YYY" text length. The whole find bar probably
shouldn't change size when the label appears/disappears or when its contents
change.

You said offline that this should add some minimum match count label width, and
reduce the textfield's preferred width for a fairly unchanged overall find bar
preferred width, but I think that can be addressed in a followup patch.

For now, I subtract 2*kTextPadding from the overall preferred width, because
that's now inherently part of views::Textfield::GetPreferredSize (this leaves
the overall find bar preferred size unchanged).

   gfx::Size prefsize = find_text_->GetPreferredSize();
   prefsize.set_height(preferred_height_);
 
   // Add up all the preferred sizes and margins of the rest of the controls.
-  prefsize.Enlarge(kMarginLeftOfCloseButton + kMarginRightOfCloseButton +
-                       kMarginLeftOfFindTextfield,
-                   0);
+  prefsize.Enlarge(
+    kMarginLeftOfCloseButton + kMarginRightOfCloseButton +
+        kMarginLeftOfFindTextfield - views::Textfield::kTextPadding,
+    0);
   prefsize.Enlarge(find_previous_button_->GetPreferredSize().width(), 0);
   prefsize.Enlarge(find_next_button_->GetPreferredSize().width(), 0);
   prefsize.Enlarge(close_button_->GetPreferredSize().width(), 0);
   return prefsize;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // FindBarView, views::ButtonListener implementation:
 
 void FindBarView::ButtonPressed(
@@ skipping 131 matching lines @@
 
 void FindBarView::OnThemeChanged() {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   if (GetThemeProvider()) {
     close_button_->SetBackground(
         GetThemeProvider()->GetColor(ThemeProperties::COLOR_TAB_TEXT),
         rb.GetImageSkiaNamed(IDR_CLOSE_1),
         rb.GetImageSkiaNamed(IDR_CLOSE_1_MASK));
   }
 }