Linux findbar improvements:...

chrome/browser/gtk/find_bar_gtk.h

 // Copyright (c) 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.
 
 #ifndef CHROME_BROWSER_GTK_FIND_BAR_GTK_H_
 #define CHROME_BROWSER_GTK_FIND_BAR_GTK_H_
 
 #include <gtk/gtk.h>
 
 #include "base/basictypes.h"
@@ skipping 14 matching lines @@
  public:
   FindBarGtk(BrowserWindowGtk* browser);
   virtual ~FindBarGtk();
 
   // Callback when the text in the find box changes.
   void ContentsChanged();
 
   // Callback when Escape is pressed.
   void EscapePressed();
 
-  GtkWidget* widget() const { return container_.get(); }
+  GtkWidget* widget() const { return fixed_.get(); }
 
   // Methods from FindBar.
   virtual FindBarController* GetFindBarController() const {
     return find_bar_controller_;
   }
   virtual void SetFindBarController(FindBarController* find_bar_controller) {
     find_bar_controller_ = find_bar_controller;
   }
   virtual void Show();
   virtual void Hide(bool animate);
   virtual void SetFocusAndSelection();
   virtual void ClearResults(const FindNotificationDetails& results);
   virtual void StopAnimation();
   virtual void MoveWindowIfNecessary(const gfx::Rect& selection_rect,
                                      bool no_redraw);
   virtual void SetFindText(const string16& find_text);
   virtual void UpdateUIForFindResult(const FindNotificationDetails& result,
                                      const string16& find_text);
   virtual gfx::Rect GetDialogPosition(gfx::Rect avoid_overlapping_rect);
   virtual void SetDialogPosition(const gfx::Rect& new_pos, bool no_redraw);
   virtual bool IsFindBarVisible();
   virtual void RestoreSavedFocus();
   virtual FindBarTesting* GetFindBarTesting();
 
   // Methods from FindBarTesting.
   virtual bool GetFindBarWindowInfo(gfx::Point* position,
                                     bool* fully_visible);
 
+  // Make sure the find bar is foremost on the z axis in the widget hierarchy
+  // by hiding and showing it.
+  void AssureOnTop();
+
  private:
   void InitWidgets();
 
   // Callback for previous, next, and close button.
   static void OnButtonPressed(GtkWidget* button, FindBarGtk* find_bar);
 
-  // GtkHBox containing the find bar widgets.
-  OwnedWidgetGtk container_;
+  // Called when |fixed_| changes sizes. Used to position |container_|.
+  static void OnSizeAllocate(GtkWidget* fixed,
+                             GtkAllocation* allocation,
+                             FindBarGtk* container_);
+
+  // GtkFixed containing the find bar widgets.
+  OwnedWidgetGtk fixed_;
+
+  // An event box which shows the background for |fixed_|. We could just set
+  // |fixed_| to have its own GdkWindow and draw the background directly, but
+  // then |container_| would clip to the bounds of |fixed_|.
+  GtkWidget* border_;
+
+  // A GtkAlignment which holds what the user perceives as the findbar (the text
+  // field, the buttons, etc.).
+  GtkWidget* container_;
 
   // The widget where text is entered.
   GtkWidget* find_text_;
 
   // The next and previous match buttons.
   scoped_ptr<CustomDrawButton> find_previous_button_;
   scoped_ptr<CustomDrawButton> find_next_button_;
 
   // The X to close the find bar.
   scoped_ptr<CustomDrawButton> close_button_;
 
   // Pointer back to the owning controller.
   FindBarController* find_bar_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(FindBarGtk);
 };
 
 #endif  // CHROME_BROWSER_GTK_FIND_BAR_GTK_H_