Auto-size the views version of the options dialog.

views/grid_layout.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/grid_layout.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
@@ skipping 826 matching lines @@
 }
 
 void GridLayout::SizeRowsAndColumns(bool layout, int width, int height,
                                     gfx::Size* pref) {
   // Make sure the master columns have been calculated.
   CalculateMasterColumnsIfNecessary();
   pref->SetSize(0, 0);
   if (rows_.empty())
     return;
 
-  // Calculate the size of each of the columns. Some views preferred heights are
-  // derived from their width, as such we need to calculate the size of the
-  // columns first.
+  // Calculate the preferred width of each of the columns. Some views'
+  // preferred heights are derived from their width, as such we need to
+  // calculate the size of the columns first.
   for (std::vector<ColumnSet*>::iterator i = column_sets_.begin();
        i != column_sets_.end(); ++i) {
     (*i)->CalculateSize();
-    if (layout || width > 0) {
-      // We're doing a layout, divy up any extra space.
-      (*i)->Resize(width - (*i)->LayoutWidth() - left_inset_ - right_inset_);
-      // And reset the x coordinates.
-      (*i)->ResetColumnXCoordinates();
-    }
     pref->set_width(std::max(pref->width(), (*i)->LayoutWidth()));
   }
   pref->set_width(pref->width() + left_inset_ + right_inset_);
 
+  // Go over the columns again and set them all to the size we settled for.
+  width = width ? width : pref->width();
+  for (std::vector<ColumnSet*>::iterator i = column_sets_.begin();
+       i != column_sets_.end(); ++i) {
+    // We're doing a layout, divy up any extra space.
+    (*i)->Resize(width - (*i)->LayoutWidth() - left_inset_ - right_inset_);
+    // And reset the x coordinates.
+    (*i)->ResetColumnXCoordinates();
+  }
+
   // Reset the height of each row.
   LayoutElement::ResetSizes(&rows_);
 
   // Do the following:
   // . If the view is aligned along it's baseline, obtain the baseline from the
   //   view and update the rows ascent/descent.
   // . Reset the remaining_height of each view state.
   // . If the width the view will be given is different than it's pref, ask
   //   for the height given a particularly width.
   for (std::vector<ViewState*>::iterator i= view_states_.begin();
@@ skipping 183 matching lines @@
 }
 
 }  // namespace views
 
 views::GridLayout* CreatePanelGridLayout(views::View* host) {
   views::GridLayout* layout = new views::GridLayout(host);
   layout->SetInsets(kPanelVertMargin, kPanelHorizMargin,
                     kPanelVertMargin, kPanelHorizMargin);
   return layout;
 }
-