Make FindBar obey dialog bounds for GTK. Will fix other platforms in separate patches.

chrome/browser/ui/gtk/find_bar_gtk.cc

 // Copyright (c) 2011 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/find_bar_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 
 #include <algorithm>
 #include <string>
@@ skipping 253 matching lines @@
       l10n_util::GetStringUTF8(IDS_FIND_IN_PAGE_PREVIOUS_TOOLTIP).c_str());
   gtk_box_pack_end(GTK_BOX(hbox), find_previous_button_->widget(),
                    FALSE, FALSE, 0);
 
   // Make a box for the edit and match count widgets. This is fixed size since
   // we want the widgets inside to resize themselves rather than making the
   // dialog bigger.
   GtkWidget* content_hbox = gtk_hbox_new(FALSE, 0);
   gtk_widget_set_size_request(content_hbox, kTextEntryWidth, -1);
 
+  // Connect to the "size-allocate" signal so we can adjust the size downwards
+  // if it ends up being too big for the allocated space.
+  g_signal_connect(content_hbox, "size-allocate",
+                   G_CALLBACK(OnContentSizeAllocate), this);
+
   text_entry_ = gtk_entry_new();
   gtk_entry_set_has_frame(GTK_ENTRY(text_entry_), FALSE);
 
   match_count_label_ = gtk_label_new(NULL);
   // This line adds padding on the sides so that the label has even padding on
   // all edges.
   gtk_misc_set_padding(GTK_MISC(match_count_label_), 2, 0);
   match_count_event_box_ = gtk_event_box_new();
   GtkWidget* match_count_centerer = gtk_vbox_new(FALSE, 0);
   gtk_box_pack_start(GTK_BOX(match_count_centerer), match_count_event_box_,
@@ skipping 128 matching lines @@
 }
 
 void FindBarGtk::AudibleAlert() {
   // This call causes a lot of weird bugs, especially when using the custom
   // frame. TODO(estade): if people complain, re-enable it. See
   // http://crbug.com/27635 and others.
   //
   //   gtk_widget_error_bell(widget());
 }
 
-gfx::Rect FindBarGtk::GetDialogPosition(gfx::Rect avoid_overlapping_rect) {
+gfx::Rect FindBarGtk::GetDialogBounds() {
   bool ltr = !base::i18n::IsRTL();
   // 15 is the size of the scrollbar, copied from ScrollbarThemeChromium.
   // The height is not used.
   // At very low browser widths we can wind up with a negative |dialog_bounds|
   // width, so clamp it to 0.
-  gfx::Rect dialog_bounds = gfx::Rect(ltr ? 0 : 15, 0,
+  return gfx::Rect(ltr ? 0 : 15, 0,
       std::max(0, widget()->parent->allocation.width - (ltr ? 15 : 0)), 0);
+}
+
+gfx::Rect FindBarGtk::GetDialogPosition(gfx::Rect avoid_overlapping_rect) {
+  gfx::Rect dialog_bounds = GetDialogBounds();
 
   GtkRequisition req;
   gtk_widget_size_request(container_, &req);
   gfx::Size prefsize(req.width, req.height);
 
+  bool ltr = !base::i18n::IsRTL();
   gfx::Rect view_location(
       ltr ? dialog_bounds.width() - prefsize.width() : dialog_bounds.x(),
       dialog_bounds.y(), prefsize.width(), prefsize.height());
   gfx::Rect new_pos = FindBarController::GetLocationForFindbarView(
       view_location, dialog_bounds, avoid_overlapping_rect);
 
   return new_pos;
 }
 
 bool FindBarGtk::IsFindBarVisible() {
@@ skipping 126 matching lines @@
                NULL);
   std::string contents(gtk_entry_get_text(GTK_ENTRY(text_entry_)));
   return UTF8ToUTF16(contents.substr(cursor_pos, selection_bound));
 }
 
 string16 FindBarGtk::GetMatchCountText() {
   std::string contents(gtk_label_get_text(GTK_LABEL(match_count_label_)));
   return UTF8ToUTF16(contents);
 }
 
+int FindBarGtk::GetWidth() {
+  GtkRequisition req;
+  gtk_widget_size_request(container_, &req);

[Evan Stade, 2011/05/23 19:29:15]

perhaps a note here about why you are returning the width request and not the
actual width (i.e. container_->allocation.width)

[jennb, 2011/05/24 01:05:37]

Changed to use allocation. I didn't know about it before.

+  return req.width;
+}
+
 void FindBarGtk::FindEntryTextInContents(bool forward_search) {
   TabContentsWrapper* tab_contents = find_bar_controller_->tab_contents();
   if (!tab_contents)
     return;
   FindTabHelper* find_tab_helper = tab_contents->find_tab_helper();
 
   std::string new_contents(gtk_entry_get_text(GTK_ENTRY(text_entry_)));
 
   if (new_contents.length() > 0) {
     find_tab_helper->StartFinding(UTF8ToUTF16(new_contents), forward_search,
@@ skipping 137 matching lines @@
 void FindBarGtk::OnParentSet(GtkWidget* widget, GtkObject* old_parent,
                              FindBarGtk* find_bar) {
   if (!widget->parent)
     return;
 
   g_signal_connect(widget->parent, "set-floating-position",
                    G_CALLBACK(OnSetFloatingPosition), find_bar);
 }
 
 // static
+void FindBarGtk::OnContentSizeAllocate(GtkWidget* content_hbox,
+                                       GtkAllocation* allocation,
+                                       FindBarGtk* find_bar) {
+  gfx::Rect dialog_bounds = find_bar->GetDialogBounds();
+  GtkRequisition req;
+  gtk_widget_size_request(find_bar->widget(), &req);
+
+  if (req.width > dialog_bounds.width()) {
+    GtkRequisition hbox_req;
+    gtk_widget_size_request(content_hbox, &hbox_req);
+    int new_width = hbox_req.width - (req.width - dialog_bounds.width());
+    gtk_widget_set_size_request(content_hbox, new_width, -1);

[Evan Stade, 2011/05/23 19:29:15]

technically you aren't supposed to change your request in response to an
allocate signal because it can cause an infinite loop (size request causes
another allocate causes another size request...)

What about connecting to the allocation signal on the content area (in
browser_window_gtk.cc) and passing that through to the findbar (e.g.
SetAvailableWidth or something like that)

[jennb, 2011/05/24 01:05:37]

Good tip. Thanks!
I think I managed to do what you're suggesting... 

+  }
+}
+
+// static
 void FindBarGtk::OnSetFloatingPosition(
     GtkFloatingContainer* floating_container,
     GtkAllocation* allocation,
     FindBarGtk* find_bar) {
   GtkWidget* findbar = find_bar->widget();
 
   int xposition = find_bar->GetDialogPosition(find_bar->selection_rect_).x();
 
   GValue value = { 0, };
   g_value_init(&value, G_TYPE_INT);
@@ skipping 238 matching lines @@
 
 // static
 gboolean FindBarGtk::OnFocusOut(GtkWidget* entry, GdkEventFocus* event,
                                 FindBarGtk* find_bar) {
   g_signal_handlers_disconnect_by_func(
       gdk_keymap_get_for_display(gtk_widget_get_display(entry)),
       reinterpret_cast<gpointer>(&OnKeymapDirectionChanged), find_bar);
 
   return FALSE;  // Continue propagation.
 }