Gtk content shell: make the window shrinkable.

content/shell/shell_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 "content/shell/shell.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
 #include "base/logging.h"
@@ skipping 83 matching lines @@
   if (headless_)
     return;
 
   if (loading)
     gtk_spinner_start(GTK_SPINNER(spinner_));
   else
     gtk_spinner_stop(GTK_SPINNER(spinner_));
 }
 
 void Shell::PlatformCreateWindow(int width, int height) {
-  SizeTo(width, height);
-
-  if (headless_)
+  ui_elements_height_ = 0;
+  if (headless_) {
+    SizeTo(width, height);
     return;
+  }
 
   window_ = GTK_WINDOW(gtk_window_new(GTK_WINDOW_TOPLEVEL));
   gtk_window_set_title(window_, "Content Shell");
   g_signal_connect(G_OBJECT(window_), "destroy",
                    G_CALLBACK(OnWindowDestroyedThunk), this);
 
   vbox_ = gtk_vbox_new(FALSE, 0);
 
   // Create the menu bar.
   GtkWidget* menu_bar = CreateMenuBar(this);
@@ skipping 76 matching lines @@
   gtk_widget_set_size_request(spinner_, 20, 20);
   gtk_container_add(GTK_CONTAINER(spinner_alignment), spinner_);
 
   spinner_item_ = gtk_tool_item_new();
   gtk_container_add(GTK_CONTAINER(spinner_item_), spinner_alignment);
   gtk_toolbar_insert(GTK_TOOLBAR(toolbar), spinner_item_, -1 /* append */);
 
   gtk_box_pack_start(GTK_BOX(vbox_), toolbar, FALSE, FALSE, 0);
 
   gtk_container_add(GTK_CONTAINER(window_), vbox_);
+
+  // Trigger layout of the UI elements, so that we can measure their
+  // heights. The width and height passed to this method are meant for the web
+  // contents view, not the top-level window. Since Gtk only seems to provide a
+  // suitable resizing function for top-level windows, we need to know how to
+  // convert from web contents view size to top-level window size.
+  gtk_widget_show_all(GTK_WIDGET(vbox_));
+
+  // Measure the heights of the UI elements, now that they have been laid out.
+  GtkRequisition elm_size;
+  gtk_widget_size_request(menu_bar, &elm_size);
+  ui_elements_height_ += elm_size.height;
+  gtk_widget_size_request(toolbar, &elm_size);
+  ui_elements_height_ += elm_size.height;
+
+  // We're ready to set an initial window size.
+  SizeTo(width, height);
+
+  // Finally, show the window.
   gtk_widget_show_all(GTK_WIDGET(window_));
 }
 
 void Shell::PlatformSetContents() {
   if (headless_)
     return;
 
   WebContentsView* content_view = web_contents_->GetView();
   gtk_container_add(GTK_CONTAINER(vbox_), content_view->GetNativeView());
 }
 
 void Shell::SizeTo(int width, int height) {
   content_width_ = width;
   content_height_ = height;
-  if (web_contents_) {
+
+  // Prefer setting the top level window's size (if we have one), rather than
+  // setting the inner widget's minimum size (so that the user can shrink the
+  // window if she wants).
+  if (window_) {
+    gtk_window_resize(window_, width, height + ui_elements_height_);
+  } else if (web_contents_) {
     gtk_widget_set_size_request(web_contents_->GetView()->GetNativeView(),
                                 width, height);
   }
 }
 
 void Shell::PlatformResizeSubViews() {
   SizeTo(content_width_, content_height_);
 }
 
 void Shell::Close() {
@@ skipping 75 matching lines @@
 
 void Shell::PlatformSetTitle(const string16& title) {
   if (headless_)
     return;
 
   std::string title_utf8 = UTF16ToUTF8(title);
   gtk_window_set_title(GTK_WINDOW(window_), title_utf8.c_str());
 }
 
 }  // namespace content