Auto-size the views version of the options dialog.

views/controls/table/table_view.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/controls/table/table_view.h"
 
 #include <commctrl.h>
 #include <windowsx.h>
 
 #include <algorithm>
@@ skipping 46 matching lines @@
                      bool autosize_columns)
     : model_(model),
       table_view_observer_(NULL),
       visible_columns_(),
       all_columns_(),
       column_count_(static_cast<int>(columns.size())),
       table_type_(table_type),
       single_selection_(single_selection),
       ignore_listview_change_(false),
       custom_colors_enabled_(false),
-      sized_columns_(false),
       autosize_columns_(autosize_columns),
       resizable_columns_(resizable_columns),
       list_view_(NULL),
       header_original_handler_(NULL),
       original_handler_(NULL),
       ALLOW_THIS_IN_INITIALIZER_LIST(table_view_wrapper_(this)),
       custom_cell_font_(NULL),
       content_offset_(0) {
   for (std::vector<TableColumn>::const_iterator i = columns.begin();
       i != columns.end(); ++i) {
@@ skipping 48 matching lines @@
 
   SendMessage(list_view_, WM_SETREDRAW, static_cast<WPARAM>(TRUE), 0);
 }
 
 void TableView::DidChangeBounds(const gfx::Rect& previous,
                                 const gfx::Rect& current) {
   if (!list_view_)
     return;
   SendMessage(list_view_, WM_SETREDRAW, static_cast<WPARAM>(FALSE), 0);
   Layout();
-  if ((!sized_columns_ || autosize_columns_) && width() > 0) {
-    sized_columns_ = true;
+  if (autosize_columns_ && width() > 0)
     ResetColumnSizes();
-  }
   UpdateContentOffset();
   SendMessage(list_view_, WM_SETREDRAW, static_cast<WPARAM>(TRUE), 0);
 }
 
 int TableView::RowCount() const {
   if (!list_view_)
     return 0;
   return ListView_GetItemCount(list_view_);
 }
 
@@ skipping 1394 matching lines @@
   gfx::Font font = GetAltTextFont();
   // Pad height by 2 for halo.
   return gfx::Rect(kXOffset, content_offset(), client_rect.width() - kXOffset,
                    std::max(kImageSize, font.height() + 2));
 }
 
 gfx::Font TableView::GetAltTextFont() {
   return ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::BaseFont);
 }
 
+void TableView::VisibilityChanged(View* starting_from, bool is_visible) {
+  // GetClientRect as used by ResetColumnSize to obtain the total width
+  // available to the columns only works when the native control is visible, so
+  // update the column sizes in case we become visible. This depends on
+  // VisibilityChanged() being called in post order on the view tree.
+  if (is_visible && autosize_columns_)
+    ResetColumnSizes();
+}
+
 
 //
 // TableSelectionIterator
 //
 TableSelectionIterator::TableSelectionIterator(TableView* view,
                                                int view_index)
     : table_view_(view),
       view_index_(view_index) {
   UpdateModelIndexFromViewIndex();
 }
@@ skipping 24 matching lines @@
 }
 
 void TableSelectionIterator::UpdateModelIndexFromViewIndex() {
   if (view_index_ == -1)
     model_index_ = -1;
   else
     model_index_ = table_view_->ViewToModel(view_index_);
 }
 
 }  // namespace views