(Views only) Resize the menu buttons on the Website Settings UI to fit the button text

chrome/browser/ui/views/website_settings/permission_selector_view.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 "chrome/browser/ui/views/website_settings/permission_selector_view.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/website_settings/website_settings_ui.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/gfx/image/image.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/menu/menu_model_adapter.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
 
 // Left icon margin.
-const int kPermissionIconMarginLeft = 6;
+static const int kPermissionIconMarginLeft = 6;

[msw, 2012/07/30 15:48:42]

nit: you don't have to explicitly mark these two as static.

[markusheintz_, 2012/07/30 16:32:06]

Done.

 // The width of the column that contains the permissions icons.
-const int kPermissionIconColumnWidth = 20;
+static const int kPermissionIconColumnWidth = 20;
 
 // An array with |ContentSetting|s ordered by CommandID. The array is used to
 // lookup a content setting for a given command id.
 const ContentSetting kSettingsForCommandIDs[] = {
   CONTENT_SETTING_DEFAULT,  // COMMAND_SET_TO_DEFAULT
   CONTENT_SETTING_ALLOW,    // COMMAND_SET_TO_ALLOW
   CONTENT_SETTING_BLOCK,    // COMMAND_SET_TO_BLOCK
 };
 
 }  // namespace
@@ skipping 49 matching lines @@
 class PermissionMenuButton : public views::MenuButton,
                              public views::MenuButtonListener {
  public:
   // Creates a new |PermissionMenuButton| with the passed |text|. The ownership
   // of the |model| remains with the caller and is not transfered to the
   // |PermissionMenuButton|.
   PermissionMenuButton(const string16& text,
                        PermissionMenuModel* model);
   virtual ~PermissionMenuButton();
 
+  // Overridden from views::MenuButton.
+  virtual gfx::Size GetPreferredSize() OVERRIDE;
+
+  // Overridden from views::TextButton.
+  virtual void SetText(const string16& text) OVERRIDE;
+
  private:
-  // Overridden from views::MenuButtonListener:
+  // Overridden from views::MenuButtonListener.
   virtual void OnMenuButtonClicked(View* source,
                                    const gfx::Point& point) OVERRIDE;
 
   PermissionMenuModel* menu_model_;  // Owned by |PermissionSelectorView|.
   scoped_ptr<views::MenuRunner> menu_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(PermissionMenuButton);
 };
 
 ///////////////////////////////////////////////////////////////////////////////
@@ skipping 42 matching lines @@
   // Accelerators are not supported.
   return false;
 }
 
 void PermissionMenuModel::ExecuteCommand(int command_id) {
   current_setting_ = kSettingsForCommandIDs[command_id];
   permission_selector_->SelectionChanged();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-// PermissionMenuModel
+// PermissionMenuButton
 ///////////////////////////////////////////////////////////////////////////////
 
 PermissionMenuButton::PermissionMenuButton(const string16& text,
                                            PermissionMenuModel* model)
     : ALLOW_THIS_IN_INITIALIZER_LIST(MenuButton(NULL, text, this, true)),
       menu_model_(model) {
 }
 
 PermissionMenuButton::~PermissionMenuButton() {
 }
 
+gfx::Size PermissionMenuButton::GetPreferredSize() {
+  gfx::Insets insets = GetInsets();
+  // Scale the button to the current text size.
+  gfx::Size prefsize(text_size_.width() + insets.width(),
+                     text_size_.height() + insets.height());
+  if (max_width_ > 0)
+    prefsize.set_width(std::min(max_width_, prefsize.width()));
+  if (show_menu_marker()) {
+    prefsize.Enlarge(menu_marker()->width() +
+                         views::MenuButton::kMenuMarkerPaddingLeft +

[msw, 2012/07/30 15:48:42]

nit: Should these indent to match the paren above? I'm not sure.

[markusheintz_, 2012/07/30 16:32:06]

I'm not sure either. I copied that style from menu_button.cc:169. I guess it's
ok as you can at least distiguish the two params Which is much harde if I would
outdent the line above and below.

+                         views::MenuButton::kMenuMarkerPaddingRight,
+                     0);
+  }
+  return prefsize;
+}
+
+void PermissionMenuButton::SetText(const string16& text) {
+  MenuButton::SetText(text);
+  SizeToPreferredSize();
+}
+
 void PermissionMenuButton::OnMenuButtonClicked(View* source,
                                                const gfx::Point& point) {
   views::MenuModelAdapter menu_model_adapter(menu_model_);
   menu_runner_.reset(new views::MenuRunner(menu_model_adapter.CreateMenu()));
 
   gfx::Point p(point);
   p.Offset(-source->width(), 0);
   if (menu_runner_->RunMenuAt(
           source->GetWidget()->GetTopLevelWidget(),
           this,
@@ skipping 96 matching lines @@
 }
 
 ContentSetting PermissionSelectorView::GetSelectedSetting() const {
   return menu_button_model_->current_setting();
 }
 
 ContentSettingsType PermissionSelectorView::GetPermissionType() const {
   return menu_button_model_->site_permission();
 }
 
+void PermissionSelectorView::ChildPreferredSizeChanged(View* child) {
+  SizeToPreferredSize();
+  // FIXME: The parent is only a plain |View| that is used as a
+  // container/box/panel. The SizeToPreferredSize method of the parent is
+  // called here directly in order not to implement a custom |View| class with
+  // its own implementation of the ChildPreferredSizeChanged method.
+  parent()->SizeToPreferredSize();
+}
+
 PermissionSelectorView::~PermissionSelectorView() {
 }