views::ImageButton: Added SetMinimumImageSize; removed SetPreferredSize.

ui/views/controls/button/image_button_unittest.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 "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/layout.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/test/views_test_base.h"
 
@@ skipping 10 matching lines @@
 namespace views {
 
 typedef ViewsTestBase ImageButtonTest;
 
 TEST_F(ImageButtonTest, Basics) {
   ImageButton button(NULL);
 
   // Our image to paint starts empty.
   EXPECT_TRUE(button.GetImageToPaint().isNull());
 
-  // Without a theme, buttons are 16x14 by default.
+  // Without an image, buttons are 16x14 by default.
   EXPECT_EQ("16x14", button.GetPreferredSize().ToString());
 
-  // We can set a preferred size when we have no image.
-  button.SetPreferredSize(gfx::Size(5, 15));
-  EXPECT_EQ("5x15", button.GetPreferredSize().ToString());
+  // The minimum image size should be applied even when there is no image.
+  button.SetMinimumImageSize(gfx::Size(5, 15));
+  EXPECT_EQ("5x15", button.minimum_image_size().ToString());
+  EXPECT_EQ("16x15", button.GetPreferredSize().ToString());
 
   // Set a normal image.
   gfx::ImageSkia normal_image = CreateTestImage(10, 20);
   button.SetImage(CustomButton::STATE_NORMAL, &normal_image);
 
   // Image uses normal image for painting.
   EXPECT_FALSE(button.GetImageToPaint().isNull());
   EXPECT_EQ(10, button.GetImageToPaint().width());
   EXPECT_EQ(20, button.GetImageToPaint().height());
 
   // Preferred size is the normal button size.
   EXPECT_EQ("10x20", button.GetPreferredSize().ToString());
 
   // Set a pushed image.
   gfx::ImageSkia pushed_image = CreateTestImage(11, 21);
   button.SetImage(CustomButton::STATE_PRESSED, &pushed_image);
 
   // By convention, preferred size doesn't change, even though pushed image
   // is bigger.
   EXPECT_EQ("10x20", button.GetPreferredSize().ToString());
 
   // We're still painting the normal image.
   EXPECT_FALSE(button.GetImageToPaint().isNull());
   EXPECT_EQ(10, button.GetImageToPaint().width());
   EXPECT_EQ(20, button.GetImageToPaint().height());
+
+  // The minimum image size should make the preferred size bigger.
+  button.SetMinimumImageSize(gfx::Size(15, 5));
+  EXPECT_EQ("15x5", button.minimum_image_size().ToString());
+  EXPECT_EQ("15x20", button.GetPreferredSize().ToString());
+  button.SetMinimumImageSize(gfx::Size(15, 25));
+  EXPECT_EQ("15x25", button.minimum_image_size().ToString());
+  EXPECT_EQ("15x25", button.GetPreferredSize().ToString());
 }
 
 TEST_F(ImageButtonTest, SetAndGetImage) {
   ImageButton button(NULL);
 
   // Images start as null.
   EXPECT_TRUE(button.GetImage(Button::STATE_NORMAL).isNull());
   EXPECT_TRUE(button.GetImage(Button::STATE_HOVERED).isNull());
   EXPECT_TRUE(button.GetImage(Button::STATE_PRESSED).isNull());
   EXPECT_TRUE(button.GetImage(Button::STATE_DISABLED).isNull());
@@ skipping 33 matching lines @@
   EXPECT_EQ(gfx::Point().ToString(),
             button.ComputeImagePaintPosition(image).ToString());
 
   button.SetImageAlignment(ImageButton::ALIGN_CENTER,
                            ImageButton::ALIGN_MIDDLE);
   EXPECT_EQ(gfx::Point(15, 10).ToString(),
             button.ComputeImagePaintPosition(image).ToString());
   button.SetBorder(views::Border::CreateEmptyBorder(10, 10, 0, 0));
   EXPECT_EQ(gfx::Point(20, 15).ToString(),
             button.ComputeImagePaintPosition(image).ToString());
+
+  // The entire button's size should take the border into account.
+  EXPECT_EQ(gfx::Size(30, 40).ToString(), button.GetPreferredSize().ToString());
+
+  // The border should be added on top of the minimum image size.
+  button.SetMinimumImageSize(gfx::Size(30, 5));
+  EXPECT_EQ(gfx::Size(40, 40).ToString(), button.GetPreferredSize().ToString());
 }
 
 TEST_F(ImageButtonTest, LeftAlignedMirrored) {
   ImageButton button(NULL);
   gfx::ImageSkia image = CreateTestImage(20, 30);
   button.SetImage(CustomButton::STATE_NORMAL, &image);
   button.SetBounds(0, 0, 50, 30);
   button.SetImageAlignment(ImageButton::ALIGN_LEFT,
                            ImageButton::ALIGN_BOTTOM);
   button.SetDrawImageMirrored(true);
@@ skipping 13 matching lines @@
                            ImageButton::ALIGN_BOTTOM);
   button.SetDrawImageMirrored(true);
 
   // Because the coordinates are flipped, we should expect this to draw as if
   // it were ALIGN_LEFT.
   EXPECT_EQ(gfx::Point(0, 0).ToString(),
             button.ComputeImagePaintPosition(image).ToString());
 }
 
 }  // namespace views