Panel auto-resize for GTK.

chrome/browser/ui/panels/panel_browser_window_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/panels/panel_browser_window_gtk.h"
 
 #include "chrome/browser/ui/panels/panel.h"
 #include "chrome/browser/ui/panels/panel_manager.h"
 #include "chrome/browser/ui/panels/panel_mouse_watcher.h"
 #include "chrome/browser/ui/panels/panel_settings_menu_model.h"
@@ skipping 10 matching lines @@
 PanelBrowserWindowGtk::PanelBrowserWindowGtk(Browser* browser,
                                              Panel* panel,
                                              const gfx::Rect& bounds)
     : BrowserWindowGtk(browser),
       last_mouse_down_(NULL),
       drag_widget_(NULL),
       destroy_drag_widget_factory_(this),
       drag_end_factory_(this),
       panel_(panel),
       bounds_(bounds),
-      restored_height_(bounds.height()) {
+      restored_height_(bounds.height()),
+      non_client_area_size_known_(false) {
 }
 
 PanelBrowserWindowGtk::~PanelBrowserWindowGtk() {
   if (drag_widget_) {
     // Terminate the grab if we have it. We could do this using any widget,
     // |drag_widget_| is just convenient.
     gtk_grab_add(drag_widget_);
     gtk_grab_remove(drag_widget_);
     DestroyDragWidget();
   }
@@ skipping 50 matching lines @@
 }
 
 void PanelBrowserWindowGtk::SetGeometryHints() {
   // Set minimum height the window can be set to.
   GdkGeometry hints;
   hints.min_height = PanelManager::minimized_panel_height();
   hints.min_width = panel_->min_size().width();
   gtk_window_set_geometry_hints(
       window(), GTK_WIDGET(window()), &hints, GDK_HINT_MIN_SIZE);
 
-  SetBoundsImpl(bounds_, true);
+  SetBoundsImpl(bounds_, true);  // Force a move to set the initial position.
 }
 
 void PanelBrowserWindowGtk::SetBounds(const gfx::Rect& bounds) {
   // This should never be called.
   DLOG(WARNING) << "Unexpected call to PanelBrowserWindowGtk::SetBounds()";
 }
 
+void PanelBrowserWindowGtk::OnSizeChanged(int width, int height) {
+  BrowserWindowGtk::OnSizeChanged(width, height);
+
+  if (!non_client_area_size_known_) {
+    non_client_area_size_known_ = true;
+    panel_->OnNonClientAreaSizeKnown();
+  }
+}
+
 bool PanelBrowserWindowGtk::UseCustomFrame() {
   // We always use custom frame for panels.
   return TRUE;
 }
 
 void PanelBrowserWindowGtk::ShowSettingsMenu(GtkWidget* widget,
                                              GdkEventButton* event) {
   if (!settings_menu_.get()) {
     settings_menu_model_.reset(new PanelSettingsMenuModel(panel_.get()));
     settings_menu_.reset(new MenuGtk(this, settings_menu_model_.get()));
   }
   settings_menu_->PopupForWidget(widget, event->button, event->time);
 }
 
 void PanelBrowserWindowGtk::ShowPanel() {
   Show();
 }
 
 void PanelBrowserWindowGtk::ShowPanelInactive() {
   ShowInactive();
 }
 
 gfx::Rect PanelBrowserWindowGtk::GetPanelBounds() const {
   return bounds_;
 }
 
 void PanelBrowserWindowGtk::SetPanelBounds(const gfx::Rect& bounds) {
   if (bounds != bounds_)
-    SetBoundsImpl(bounds, true);
+    SetBoundsImpl(bounds, false);  // Only move if necessary.
 }
 
 void PanelBrowserWindowGtk::OnPanelExpansionStateChanged(
     Panel::ExpansionState expansion_state) {
   // TODO(prasadt): This is very similar to what we do for windows.  Look into
   // sharing this implementation across platforms.
   int height;
   switch (expansion_state) {
     case Panel::EXPANDED:
       height = restored_height_;
@@ skipping 10 matching lines @@
       NOTREACHED();
       height = restored_height_;
       break;
   }
 
   gfx::Rect bounds = bounds_;
   int bottom = panel_->manager()->GetBottomPositionForExpansionState(
       expansion_state);
   bounds.set_y(bottom - height);
   bounds.set_height(height);
-
-  // Do not move the window when expansion state changes.  Just change the size.
-  // Because of GDK_GRAVITY_SOUTH_EAST gravity, the window will stay docked to
-  // the bottom.
-  SetBoundsImpl(bounds, false);
+  SetBoundsImpl(bounds, false);  // Only move if necessary.
 }
 
 bool PanelBrowserWindowGtk::ShouldBringUpPanelTitlebar(int mouse_x,
                                                        int mouse_y) const {
   return bounds_.x() <= mouse_x && mouse_x <= bounds_.right() &&
          mouse_y >= bounds_.y();
 }
 
 void PanelBrowserWindowGtk::ClosePanel() {
   Close();
@@ skipping 60 matching lines @@
 
 Browser* PanelBrowserWindowGtk::GetPanelBrowser() const {
   return browser();
 }
 
 void PanelBrowserWindowGtk::DestroyPanelBrowser() {
   DestroyBrowser();
 }
 
 gfx::Size PanelBrowserWindowGtk::GetNonClientAreaExtent() const {
-  NOTIMPLEMENTED();
-  return gfx::Size();
+  return GetNonClientFrameSize();
 }
 
 int PanelBrowserWindowGtk::GetRestoredHeight() const {
-  NOTIMPLEMENTED();
-  return 0;
+  return restored_height_;
 }
 
 void PanelBrowserWindowGtk::SetRestoredHeight(int height) {
-  NOTIMPLEMENTED();
+  restored_height_ = height;
 }
 
-void PanelBrowserWindowGtk::SetBoundsImpl(const gfx::Rect& bounds, bool move) {
+void PanelBrowserWindowGtk::SetBoundsImpl(const gfx::Rect& bounds,
+                                          bool force_move) {
+  // Only move if required by caller, or if bottom right corner will change.
+  // Panels use window gravity of GDK_GRAVITY_SOUTH_EAST which means the
+  // window is anchored to the bottom right corner on resize, making it
+  // unnecessary to move the window if the bottom right corner is unchanged.
+  bool move = force_move ||
+      bounds.x() + bounds.width() != bounds_.x() + bounds_.width() ||

[jianli, 2011/09/20 23:35:39]

Simpler to call bounds.right() than bounds.x() + bounds.width().

Ditto for bounds.y() + bounds.height().

[jennb, 2011/09/20 23:46:43]

Thanks! I didn't know about right() and bottom().

+      bounds.y() + bounds.height() != bounds_.y() + bounds_.height();
+
   bounds_ = bounds;
   if (move)
     gtk_window_move(window_, bounds.x(), bounds.y());
   gtk_window_resize(window(), bounds.width(), bounds.height());
 }
 
 void PanelBrowserWindowGtk::WillProcessEvent(GdkEvent* event) {
   // Nothing to do.
 }
 
@@ skipping 228 matching lines @@
 
 void NativePanelTestingGtk::SetMousePositionForMinimizeRestore(
     const gfx::Point& hover_point) {
   PanelMouseWatcher::GetInstance()->HandleMouseMovement(hover_point);
   MessageLoopForUI::current()->RunAllPending();
 }
 
 int NativePanelTestingGtk::TitleOnlyHeight() const {
   return panel_browser_window_gtk_->TitleOnlyHeight();
 }