Extend the no-match red background to take up more space...

chrome/browser/views/find_bar_view.cc

 // Copyright (c) 2006-2009 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/views/find_bar_view.h"
 
 #include <algorithm>
 
 #include "app/gfx/canvas.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser_theme_provider.h"
 #include "chrome/browser/find_bar_controller.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/views/find_bar_win.h"
 #include "chrome/browser/view_ids.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "views/background.h"
 #include "views/controls/button/image_button.h"
 #include "views/controls/label.h"
 
 // The amount of whitespace to have before the find button.
-static const int kWhiteSpaceAfterMatchCountLabel = 3;
+static const int kWhiteSpaceAfterMatchCountLabel = 1;
 
 // The margins around the search field and the close button.
 static const int kMarginLeftOfCloseButton = 3;
 static const int kMarginRightOfCloseButton = 7;
 static const int kMarginLeftOfFindTextfield = 12;
 
 // The margins around the match count label (We add extra space so that the
 // background highlight extends beyond just the text).
 static const int kMatchCountExtraWidth = 9;
 
@@ skipping 47 matching lines @@
       find_previous_button_(NULL),
       find_next_button_(NULL),
       close_button_(NULL),
       animation_offset_(0) {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
 
   find_text_ = new views::Textfield();
   find_text_->SetID(VIEW_ID_FIND_IN_PAGE_TEXT_FIELD);
   find_text_->SetFont(rb.GetFont(ResourceBundle::BaseFont));
   find_text_->set_default_width_in_chars(kDefaultCharWidth);
+  find_text_->SetController(this);
   AddChildView(find_text_);
 
   match_count_text_ = new views::Label();
   match_count_text_->SetFont(rb.GetFont(ResourceBundle::BaseFont));
   match_count_text_->SetColor(kTextColorMatchCount);
   match_count_text_->SetHorizontalAlignment(views::Label::ALIGN_CENTER);
   AddChildView(match_count_text_);
 
   // Create a focus forwarder view which sends focus to find_text_.
   focus_forwarder_view_ = new FocusForwarderView(find_text_);
@@ skipping 98 matching lines @@
     // Otherwise we show an error background behind the match_count label.
     match_count_text_->set_background(
         views::Background::CreateSolidBackground(kBackgroundColorNoMatch));
     match_count_text_->SetColor(kTextColorNoMatch);
   }
 
   // Make sure Find Next and Find Previous are enabled if we found any matches.
   find_previous_button_->SetEnabled(result.number_of_matches() > 0);
   find_next_button_->SetEnabled(result.number_of_matches() > 0);
 
-  Layout();  // The match_count label may have increased/decreased in size.
+  // The match_count label may have increased/decreased in size so we need to
+  // do a layout and repaint the dialog so that the find text field doesn't
+  // partially overlap the match-count label when it increases on no matches.
+  Layout();
+  SchedulePaint();
 }
 
 void FindBarView::SetFocusAndSelection() {
   find_text_->RequestFocus();
   if (!find_text_->text().empty()) {
     find_text_->SelectAll();
 
     find_previous_button_->SetEnabled(true);
     find_next_button_->SetEnabled(true);
   }
@@ skipping 109 matching lines @@
   // Then, the FindPrevious button to the left the FindNext button.
   sz = find_previous_button_->GetPreferredSize();
   find_previous_button_->SetBounds(find_next_button_->x() -
                                        find_previous_button_->width(),
                                    (height() - sz.height()) / 2,
                                    sz.width(),
                                    sz.height());
 
   // Then the label showing the match count number.
   sz = match_count_text_->GetPreferredSize();
+  // We want to make sure the red "no-match" background almost completely fills
+  // up the amount of vertical space within the text box. We therefore fix the
+  // size relative to the button heights, which are fixed. We use the FindPrev
+  // button, which has a 1px outer margin, 1px border and we want to appear 1px
+  // below the border line so we subtract 3 for top and 3 for bottom.
+  sz.set_height(find_previous_button_->height() - 6);  // Subtract 3px x 2.
+
   // We extend the label bounds a bit to give the background highlighting a bit
   // of breathing room (margins around the text).
   sz.Enlarge(kMatchCountExtraWidth, 0);
   sz.set_width(std::max(kMatchCountMinWidth, static_cast<int>(sz.width())));
-  match_count_text_->SetBounds(find_previous_button_->x() -
-                                   kWhiteSpaceAfterMatchCountLabel -
-                                   sz.width(),
-                               (height() - sz.height()) / 2 + 1,
+  int match_count_x = find_previous_button_->x() -
+                      kWhiteSpaceAfterMatchCountLabel -
+                      sz.width();
+  match_count_text_->SetBounds(match_count_x,
+                               (height() - sz.height()) / 2,
                                sz.width(),
                                sz.height());
 
   // And whatever space is left in between, gets filled up by the find edit box.
   sz = find_text_->GetPreferredSize();
-  sz.set_width(match_count_text_->x() - kMarginLeftOfFindTextfield);
-  find_text_->SetBounds(match_count_text_->x() - sz.width(),
+  sz.set_width(match_count_x - kMarginLeftOfFindTextfield);
+  find_text_->SetBounds(match_count_x - sz.width(),
                         (height() - sz.height()) / 2 + 1,
                         sz.width(),
                         sz.height());
-  find_text_->SetController(this);
 
   // 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());
@@ skipping 59 matching lines @@
   // in the Find box is changed right after the tab is destroyed. Otherwise, it
   // can lead to crashes, as exposed by automation testing in issue 8048.
   if (!controller->tab_contents())
     return;
 
   // When the user changes something in the text box we check the contents and
   // if the textbox contains something we set it as the new search string and
   // initiate search (even though old searches might be in progress).
   if (!new_contents.empty()) {
     // The last two params here are forward (true) and case sensitive (false).
-    controller->tab_contents()->StartFinding(WideToUTF16(new_contents), true, false);
+    controller->tab_contents()->StartFinding(WideToUTF16(new_contents),

[Glen Murphy, 2009/07/06 17:49:30]

Double-check: this looks messed up (like the line spacing was added through lots
of spacing) in diff view.

[Finnur, 2009/07/06 20:37:33]

That's Rietveld for you. Because the line used to wrap to the next line,
Rietveld inserts an empty line in the diff so it looks like I added more spaces
than needed.

On 2009/07/06 17:49:30, Glen Murphy wrote:

+                                             true, false);
   } else {
     // The textbox is empty so we reset.  true = clear selection on page.
     controller->tab_contents()->StopFinding(true);
     UpdateForResult(controller->tab_contents()->find_result(), string16());
   }
 }
 
 bool FindBarView::HandleKeystroke(views::Textfield* sender,
                                   const views::Textfield::Keystroke& key) {
   // If the dialog is not visible, there is no reason to process keyboard input.
@@ skipping 29 matching lines @@
 }
 
 bool FindBarView::FocusForwarderView::OnMousePressed(
     const views::MouseEvent& event) {
   if (view_to_focus_on_mousedown_) {
     view_to_focus_on_mousedown_->ClearSelection();
     view_to_focus_on_mousedown_->RequestFocus();
   }
   return true;
 }