Adjust width of find in page bar.

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/i18n/number_formatting.h"
 #include "base/macros.h"
@@ skipping 71 matching lines @@
 
 // The text color for the match count label when no matches are found.
 const SkColor kTextColorNoMatch = SK_ColorBLACK;
 
 // The background color of the match count label when results are found.
 const SkColor kBackgroundColorMatch = SkColorSetARGB(0, 255, 255, 255);
 
 // The background color of the match count label when no results are found.
 const SkColor kBackgroundColorNoMatch = SkColorSetRGB(255, 102, 102);
 
-// The default number of average characters that the text box will be. This
-// number brings the width on a "regular fonts" system to about 300px.
+// The default number of average characters that the text box will be.
 const int kDefaultCharWidth = 43;
+const int kDefaultCharWidthMd = 26;
 
 // The match count label is like a normal label, but can process events (which
 // makes it easier to forward events to the text input --- see
 // FindBarView::TargetForRect).
 class MatchCountLabel : public views::Label {
  public:
   MatchCountLabel() {}
   ~MatchCountLabel() override {}
 
   // views::Label overrides:
   bool CanProcessEventsWithinSubtree() const override { return true; }
 
+  gfx::Size GetPreferredSize() const override {
+    // We need to return at least 1dip so that box layout adds padding on either
+    // side (otherwise there will be a jump when our size changes between empty
+    // and non-empty).
+    gfx::Size size = views::Label::GetPreferredSize();
+    size.set_width(std::max(1, size.width()));
+    return size;
+  }
+
  private:
   DISALLOW_COPY_AND_ASSIGN(MatchCountLabel);
 };
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // FindBarView, public:
 
 FindBarView::FindBarView(FindBarHost* host)
     : DropdownBarView(host),
       find_text_(nullptr),
       match_count_text_(nullptr),
       focus_forwarder_view_(nullptr),
       separator_(nullptr),
       find_previous_button_(nullptr),
       find_next_button_(nullptr),
       close_button_(nullptr) {
   find_text_ = new views::Textfield;
   find_text_->set_id(VIEW_ID_FIND_IN_PAGE_TEXT_FIELD);
-  find_text_->set_default_width_in_chars(kDefaultCharWidth);
+  find_text_->set_default_width_in_chars(
+      ui::MaterialDesignController::IsModeMaterial() ? kDefaultCharWidthMd
+                                                     : kDefaultCharWidth);
   find_text_->set_controller(this);
   find_text_->SetAccessibleName(l10n_util::GetStringUTF16(IDS_ACCNAME_FIND));
   find_text_->SetTextInputFlags(ui::TEXT_INPUT_FLAG_AUTOCORRECT_OFF);
   AddChildView(find_text_);
 
   if (ui::MaterialDesignController::IsModeMaterial()) {
     BarControlButton* find_previous = new BarControlButton(this);
     find_previous->SetIcon(
         gfx::VectorIconId::FIND_PREV,
         base::Bind(&FindBarView::GetTextColorForIcon, base::Unretained(this)));
@@ skipping 244 matching lines @@
   // in that area we focus on the find text box.
   const 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 {
   if (ui::MaterialDesignController::IsModeMaterial()) {
-    // The entire bar is sized to a specific number of characters set on
-    // |find_text_|.
     gfx::Size size = views::View::GetPreferredSize();
-    size.set_width(find_text_->GetPreferredSize().width());
+    // Ignore the preferred size for the match count label, and just let it take
+    // up part of the space for the input textfield. This prevents the overall
+    // width from changing every time the match count text changes.
+    size.set_width(size.width() -
+                   match_count_text_->GetPreferredSize().width());
     return size;
   }
 
   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 -
                        find_text_->GetInsets().width(),
@@ skipping 244 matching lines @@
   SkColor text_color =
       theme->GetSystemColor(ui::NativeTheme::kColorId_TextfieldDefaultColor);
   match_count_text_->SetEnabledColor(SkColorSetA(text_color, 0x69));
   separator_->SetColor(SkColorSetA(text_color, 0x26));
 }
 
 SkColor FindBarView::GetTextColorForIcon() {
   return GetNativeTheme()->GetSystemColor(
       ui::NativeTheme::kColorId_TextfieldDefaultColor);
 }