views::ImageButton: Added SetMinimumImageSize; removed SetPreferredSize.

ui/views/controls/button/image_button.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 "ui/views/controls/button/image_button.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/gfx/animation/throb_animation.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image_skia_operations.h"
 #include "ui/gfx/scoped_canvas.h"
 #include "ui/views/painter.h"
 #include "ui/views/widget/widget.h"
 
 namespace views {
 
-static const int kDefaultWidth = 16;   // Default button width if no theme.
-static const int kDefaultHeight = 14;  // Default button height if no theme.
+// Default button size if no image is set. This is ignored if there is an image,
+// and exists for historical reasons (any number of clients could depend on this
+// behaviour).
+static const int kDefaultWidth = 16;
+static const int kDefaultHeight = 14;
 
 const char ImageButton::kViewClassName[] = "ImageButton";
 
 ////////////////////////////////////////////////////////////////////////////////
 // ImageButton, public:
 
 ImageButton::ImageButton(ButtonListener* listener)
     : CustomButton(listener),
       h_alignment_(ALIGN_LEFT),
       v_alignment_(ALIGN_TOP),
-      preferred_size_(kDefaultWidth, kDefaultHeight),
+      minimum_image_size_(0, 0),

[sky, 2014/09/19 15:31:06]

nit: remove this as 0,0 is the default.

[Matt Giuca, 2014/09/22 00:41:05]

Done.

       draw_image_mirrored_(false),
       focus_painter_(Painter::CreateDashedFocusPainter()) {
   // By default, we request that the gfx::Canvas passed to our View::OnPaint()
   // implementation is flipped horizontally so that the button's images are
   // mirrored when the UI directionality is right-to-left.
   EnableCanvasFlippingForRTLUI(true);
 }
 
 ImageButton::~ImageButton() {
 }
@@ skipping 23 matching lines @@
                                     VerticalAlignment v_align) {
   h_alignment_ = h_align;
   v_alignment_ = v_align;
   SchedulePaint();
 }
 
 void ImageButton::SetFocusPainter(scoped_ptr<Painter> focus_painter) {
   focus_painter_ = focus_painter.Pass();
 }
 
+void ImageButton::SetMinimumImageSize(const gfx::Size& size) {
+  minimum_image_size_ = size;

[sky, 2014/09/19 15:31:06]

early out if size == minimum_image_size_

[Matt Giuca, 2014/09/22 00:41:05]

Done.

+  PreferredSizeChanged();
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // ImageButton, View overrides:
 
 gfx::Size ImageButton::GetPreferredSize() const {
-  gfx::Size size = preferred_size_;
+  gfx::Size size(kDefaultWidth, kDefaultHeight);
   if (!images_[STATE_NORMAL].isNull()) {
     size = gfx::Size(images_[STATE_NORMAL].width(),
                      images_[STATE_NORMAL].height());
   }
 
+  size.set_width(std::max(size.width(), minimum_image_size_.width()));

[sky, 2014/09/19 15:31:06]

size.SetToMax(minimum_image_size_);

[Matt Giuca, 2014/09/22 00:41:05]

Done.

+  size.set_height(std::max(size.height(), minimum_image_size_.height()));
+
   gfx::Insets insets = GetInsets();
   size.Enlarge(insets.width(), insets.height());
   return size;
 }
 
 const char* ImageButton::GetClassName() const {
   return kViewClassName;
 }
 
 void ImageButton::OnPaint(gfx::Canvas* canvas) {
@@ skipping 151 matching lines @@
   *tooltip = toggled_tooltip_text_;
   return true;
 }
 
 void ToggleImageButton::GetAccessibleState(ui::AXViewState* state) {
   ImageButton::GetAccessibleState(state);
   GetTooltipText(gfx::Point(), &state->name);
 }
 
 }  // namespace views