DevTools window doesn't restore its minimal size if it's shrinked to zero.

chrome/browser/ui/gtk/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/gtk/browser_window_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 
 #include <dlfcn.h>
 #include <string>
@@ skipping 83 matching lines @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/gtk_util.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/skia_utils_gtk.h"
 
 namespace {
 
 // The number of milliseconds between loading animation frames.
 const int kLoadingAnimationFrameTimeMs = 30;
 
-// Default height of dev tools pane when docked to the browser window.  This
-// matches the value in Views.
-const int kDefaultDevToolsHeight = 200;
-
+// Minimal height of devotools pane or content pane when devtools are docked
+// to the browser window.
 const int kMinDevToolsHeight = 50;
 
 const char* kBrowserWindowKey = "__BROWSER_WINDOW_GTK__";
 
 // The frame border is only visible in restored mode and is hardcoded to 4 px
 // on each side regardless of the system window border size.
 const int kFrameBorderThickness = 4;
 // While resize areas on Windows are normally the same size as the window
 // borders, our top area is shrunk by 1 px to make it easier to move the window
 // around with our thinner top grabbable strip.  (Incidentally, our side and
@@ skipping 1174 matching lines @@
   if (devtools_contents) {
     // TabContentsViewGtk::WasShown is not called when tab contents is shown by
     // anything other than user selecting a Tab.
     // See TabContentsViewViews::OnWindowPosChanged for reference on how it
     // should be implemented.
     devtools_contents->tab_contents()->ShowContents();
   }
 
   bool should_show = old_devtools == NULL && devtools_contents != NULL;
   bool should_hide = old_devtools != NULL && devtools_contents == NULL;
+
   if (should_show) {
+    // Restore split offset.
+    GtkAllocation contents_rect;
+    gtk_widget_get_allocation(contents_container_->widget(), &contents_rect);
+
+    int split_offset = browser_->profile()->GetPrefs()->
+        GetInteger(prefs::kDevToolsSplitLocation);
+    if (split_offset == -1)
+      split_offset = contents_rect.height * 2 / 3;
+
+    // Make sure user can see both panes.
+    split_offset = std::min(contents_rect.height - kMinDevToolsHeight,

[yurys, 2011/06/08 08:14:27]

Can we handle the case of negative offset explicitly? 

+                            std::max(kMinDevToolsHeight, split_offset));
+    gtk_paned_set_position(GTK_PANED(contents_split_), split_offset);
     gtk_widget_show(devtools_container_->widget());
   } else if (should_hide) {
-    // Store split offset when hiding devtools window only.
-    gint divider_offset = gtk_paned_get_position(GTK_PANED(contents_split_));
+    gint split_offset = gtk_paned_get_position(GTK_PANED(contents_split_));
     browser_->profile()->GetPrefs()->
-        SetInteger(prefs::kDevToolsSplitLocation, divider_offset);
+        SetInteger(prefs::kDevToolsSplitLocation, split_offset);
     gtk_widget_hide(devtools_container_->widget());
   }
 }
 
 void BrowserWindowGtk::DestroyBrowser() {
   browser_.reset();
 }
 
 gboolean BrowserWindowGtk::OnConfigure(GtkWidget* widget,
                                        GdkEventConfigure* event) {
@@ skipping 360 matching lines @@
 
   contents_container_.reset(new TabContentsContainerGtk(status_bubble_.get()));
   devtools_container_.reset(new TabContentsContainerGtk(NULL));
   ViewIDUtil::SetID(devtools_container_->widget(), VIEW_ID_DEV_TOOLS_DOCKED);
   contents_split_ = gtk_vpaned_new();
   gtk_paned_pack1(GTK_PANED(contents_split_), contents_container_->widget(),
                   TRUE, TRUE);
   gtk_paned_pack2(GTK_PANED(contents_split_), devtools_container_->widget(),
                   FALSE, TRUE);
   gtk_box_pack_end(GTK_BOX(render_area_vbox_), contents_split_, TRUE, TRUE, 0);
-  // Restore split offset.
-  int split_offset = browser_->profile()->GetPrefs()->
-      GetInteger(prefs::kDevToolsSplitLocation);
-  if (split_offset != -1) {
-    if (split_offset < kMinDevToolsHeight)
-      split_offset = kMinDevToolsHeight;
-    gtk_paned_set_position(GTK_PANED(contents_split_), split_offset);
-  } else {
-    gtk_widget_set_size_request(devtools_container_->widget(), -1,
-                                kDefaultDevToolsHeight);
-  }
+
   gtk_widget_show_all(render_area_floating_container_);
   gtk_widget_hide(devtools_container_->widget());
   render_area_event_box_ = gtk_event_box_new();
   // Set a white background so during startup the user sees white in the
   // content area before we get a TabContents in place.
   gtk_widget_modify_bg(render_area_event_box_, GTK_STATE_NORMAL,
                        &gtk_util::kGdkWhite);
   gtk_container_add(GTK_CONTAINER(render_area_event_box_),
                     render_area_floating_container_);
   gtk_widget_show(render_area_event_box_);
@@ skipping 662 matching lines @@
   // are taken from the WMs' source code.
   return (wm_name == "Blackbox" ||
           wm_name == "compiz" ||
           wm_name == "Compiz" ||
           wm_name == "e16" ||  // Enlightenment DR16
           wm_name == "Metacity" ||
           wm_name == "Mutter" ||
           wm_name == "Openbox" ||
           wm_name == "Xfwm4");
 }