InstantExtended(gtk): Hide top match if told to so.

chrome/browser/ui/gtk/omnibox/omnibox_popup_view_gtk.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/gtk/omnibox/omnibox_popup_view_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include <algorithm>
 #include <string>
@@ skipping 82 matching lines @@
 
 // Return a Rect covering the whole area of |window|.
 gfx::Rect GetWindowRect(GdkWindow* window) {
   gint width = gdk_window_get_width(window);
   gint height = gdk_window_get_height(window);
   return gfx::Rect(width, height);
 }
 
 // Return a Rect for the space for a result line.  This excludes the border,
 // but includes the padding.  This is the area that is colored for a selection.
 gfx::Rect GetRectForLine(size_t line, int width) {

[Evan Stade, 2013/08/14 19:32:48]

make this a member function so you can account for hidden matches within it.

[Jered, 2013/08/14 21:16:22]

Done.

   return gfx::Rect(kBorderThickness,
                    (line * kHeightPerResult) + kBorderThickness,
                    width - (kBorderThickness * 2),
                    kHeightPerResult);
 }
 
 // TODO(deanm): Find some better home for this, and make it more efficient.
 size_t GetUTF8Offset(const string16& text, size_t text_offset) {
   return UTF16ToUTF8(text.substr(0, text_offset)).length();
 }
@@ skipping 226 matching lines @@
 
 bool OmniboxPopupViewGtk::IsOpen() const {
   return opened_;
 }
 
 void OmniboxPopupViewGtk::InvalidateLine(size_t line) {
   // TODO(deanm): Is it possible to use some constant for the width, instead
   // of having to query the width of the window?
   GdkWindow* gdk_window = gtk_widget_get_window(GTK_WIDGET(window_));
   GdkRectangle line_rect = GetRectForLine(
-      line, GetWindowRect(gdk_window).width()).ToGdkRectangle();
+      line - GetHiddenMatchCount(),
+      GetWindowRect(gdk_window).width()).ToGdkRectangle();
   gdk_window_invalidate_rect(gdk_window, &line_rect, FALSE);
 }
 
 void OmniboxPopupViewGtk::UpdatePopupAppearance() {
   const AutocompleteResult& result = model_->result();
-  if (result.empty()) {
+  const size_t hidden_matches = GetHiddenMatchCount();
+  if (result.size() <= hidden_matches) {
     Hide();
     return;
   }
 
-  Show(result.size());
+  Show(result.size() - hidden_matches);
   gtk_widget_queue_draw(window_);
 }
 
 gfx::Rect OmniboxPopupViewGtk::GetTargetBounds() {
   if (!gtk_widget_get_realized(window_))
     return gfx::Rect();
 
   gfx::Rect retval = ui::GetWidgetScreenBounds(window_);
 
   // The widget bounds don't update synchronously so may be out of sync with
@@ skipping 89 matching lines @@
 void OmniboxPopupViewGtk::StackWindow() {
   gfx::NativeView omnibox_view = omnibox_view_->GetNativeView();
   DCHECK(GTK_IS_WIDGET(omnibox_view));
   GtkWidget* toplevel = gtk_widget_get_toplevel(omnibox_view);
   DCHECK(gtk_widget_is_toplevel(toplevel));
   ui::StackPopupWindow(window_, toplevel);
 }
 
 size_t OmniboxPopupViewGtk::LineFromY(int y) {
   size_t line = std::max(y - kBorderThickness, 0) / kHeightPerResult;
-  return std::min(line, model_->result().size() - 1);
+  return std::min(line + GetHiddenMatchCount(), model_->result().size() - 1);
 }
 
 void OmniboxPopupViewGtk::AcceptLine(size_t line,
                                      WindowOpenDisposition disposition) {
   // OpenMatch() may close the popup, which will clear the result set and, by
   // extension, |match| and its contents.  So copy the relevant match out to
   // make sure it stays alive until the call completes.
   AutocompleteMatch match = model_->result().match_at(line);
   omnibox_view_->OpenMatch(match, disposition, GURL(), line);
 }
@@ skipping 51 matching lines @@
       model_->selected_line_state() == OmniboxPopupModel::KEYWORD) {
     *match = result.match_at(index).associated_keyword.get();
     *is_selected_keyword = true;
     return;
   }
 
   *match = &result.match_at(index);
   *is_selected_keyword = false;
 }
 
+size_t OmniboxPopupViewGtk::GetHiddenMatchCount() {
+  return model_->result().ShouldHideTopMatch() ? 1 : 0;
+}
+
 gboolean OmniboxPopupViewGtk::HandleMotion(GtkWidget* widget,
                                            GdkEventMotion* event) {
   // TODO(deanm): Windows has a bunch of complicated logic here.
   size_t line = LineFromY(static_cast<int>(event->y));
   // There is both a hovered and selected line, hovered just means your mouse
   // is over it, but selected is what's showing in the location edit.
   model_->SetHoveredLine(line);
   // Select the line if the user has the left mouse button down.
   if (!ignore_mouse_drag_ && (event->state & GDK_BUTTON1_MASK))
     model_->SetSelectedLine(line, false, false);
@@ skipping 57 matching lines @@
   // to support painting a border that isn't 1 pixel thick.  There is no point
   // in writing that code now, and explode if that day ever comes.
   COMPILE_ASSERT(kBorderThickness == 1, border_1px_implied);
   // Draw the 1px border around the entire window.
   gdk_cairo_set_source_color(cr, &border_color_);
   cairo_rectangle(cr, 0, 0, window_rect.width(), window_rect.height());
   cairo_stroke(cr);
 
   pango_layout_set_height(layout_, kHeightPerResult * PANGO_SCALE);
 
-  for (size_t i = 0; i < result.size(); ++i) {
-    gfx::Rect line_rect = GetRectForLine(i, window_rect.width());
+  const size_t hidden_matches = GetHiddenMatchCount();
+  for (size_t i = hidden_matches; i < result.size(); ++i) {
+    gfx::Rect line_rect = GetRectForLine(i - hidden_matches,
+                                         window_rect.width());
     // Only repaint and layout damaged lines.
     if (!line_rect.Intersects(damage_rect))
       continue;
 
     const AutocompleteMatch* match = NULL;
     bool is_selected_keyword = false;
     GetVisibleMatchForInput(i, &match, &is_selected_keyword);
     bool is_selected = (model_->selected_line() == i);
     bool is_hovered = (model_->hovered_line() == i);
     if (is_selected || is_hovered) {
@@ skipping 89 matching lines @@
                               theme_service_->GetImageNamed(
                                   is_selected ? IDR_OMNIBOX_TTS_DARK :
                                   IDR_OMNIBOX_TTS),
                               icon_start_x, line_rect.y() + kIconTopPadding);
     }
   }
 
   cairo_destroy(cr);
   return TRUE;
 }