Auto-size the views version of the options dialog.

views/widget/widget_gtk.cc

 // Copyright (c) 2010 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 "views/widget/widget_gtk.h"
 
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 #include <X11/extensions/shape.h>
 
@@ skipping 482 matching lines @@
   gtk_widget_add_events(window_contents_,
                         GDK_ENTER_NOTIFY_MASK |
                         GDK_LEAVE_NOTIFY_MASK |
                         GDK_BUTTON_PRESS_MASK |
                         GDK_BUTTON_RELEASE_MASK |
                         GDK_POINTER_MOTION_MASK |
                         GDK_KEY_PRESS_MASK |
                         GDK_KEY_RELEASE_MASK);
   SetRootViewForWidget(widget_, root_view_.get());
 
+  g_signal_connect_after(G_OBJECT(window_contents_), "size_request",
+                         G_CALLBACK(&OnSizeRequestThunk), this);
   g_signal_connect_after(G_OBJECT(window_contents_), "size_allocate",
                          G_CALLBACK(&OnSizeAllocateThunk), this);
   gtk_widget_set_app_paintable(window_contents_, true);
   g_signal_connect(window_contents_, "expose_event",
                    G_CALLBACK(&OnPaintThunk), this);
   g_signal_connect(window_contents_, "enter_notify_event",
                    G_CALLBACK(&OnEnterNotifyThunk), this);
   g_signal_connect(window_contents_, "leave_notify_event",
                    G_CALLBACK(&OnLeaveNotifyThunk), this);
   g_signal_connect(window_contents_, "motion_notify_event",
@@ skipping 363 matching lines @@
       break;
     default:
       // We only deal with 1-3.
       break;
   }
   if (event.type == GDK_2BUTTON_PRESS)
     flags |= MouseEvent::EF_IS_DOUBLE_CLICK;
   return flags;
 }
 
+void WidgetGtk::OnSizeRequest(GtkWidget* widget, GtkRequisition* requisition) {
+  // Do only return the preferred size for child windows. GtkWindow interprets
+  // the requisition as a minimum size for top level windows, returning a
+  // preferred size for these would prevents us from setting smaller window
+  // sizes.
+  if (type_ == TYPE_CHILD) {
+    gfx::Size size(root_view_->GetPreferredSize());
+    requisition->width = size.width();
+    requisition->height = size.height();
+  }
+}
+
 void WidgetGtk::OnSizeAllocate(GtkWidget* widget, GtkAllocation* allocation) {
   // See comment next to size_ as to why we do this. Also note, it's tempting
   // to put this in the static method so subclasses don't need to worry about
   // it, but if a subclasses needs to set a shape then they need to always
   // reset the shape in this method regardless of whether the size changed.
   gfx::Size new_size(allocation->width, allocation->height);
   if (new_size == size_)
     return;
   size_ = new_size;
   root_view_->SetBounds(0, 0, allocation->width, allocation->height);
@@ skipping 636 matching lines @@
     GtkWindow* window = GTK_WINDOW(element->data);
     DCHECK(window);
     RootView *root_view = FindRootView(window);
     if (root_view)
       root_view->NotifyLocaleChanged();
   }
   g_list_free(window_list);
 }
 
 }  // namespace views