tabs: Add some empty padding around the close button.

The empty padding makes it easier to close tabs using touch events.

BUG=144696, 145258

Review URL: https://chromiumcodereview.appspot.com/10879104

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153696 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 58 insertions, 15 deletions

diff --git a/ui/views/controls/button/image_button.cc b/ui/views/controls/button/image_button.cc
index 476d80c..b111780 100644
--- a/ui/views/controls/button/image_button.cc
+++ b/ui/views/controls/button/image_button.cc
@@ -80,25 +80,14 @@ void ImageButton::OnPaint(gfx::Canvas* canvas) {
   gfx::ImageSkia img = GetImageToPaint();
 
   if (!img.isNull()) {
-    int x = 0, y = 0;
-
-    if (h_alignment_ == ALIGN_CENTER)
-      x = (width() - img.width()) / 2;
-    else if (h_alignment_ == ALIGN_RIGHT)
-      x = width() - img.width();
-
-    if (v_alignment_ == ALIGN_MIDDLE)
-      y = (height() - img.height()) / 2;
-    else if (v_alignment_ == ALIGN_BOTTOM)
-      y = height() - img.height();
-
+    gfx::Point position = ComputeImagePaintPosition(img);
     if (!background_image_.isNull())
-      canvas->DrawImageInt(background_image_, x, y);
+      canvas->DrawImageInt(background_image_, position.x(), position.y());
 
-    canvas->DrawImageInt(img, x, y);
+    canvas->DrawImageInt(img, position.x(), position.y());
 
     if (!overlay_image_.isNull())
-      canvas->DrawImageInt(overlay_image_, x, y);
+      canvas->DrawImageInt(overlay_image_, position.x(), position.y());
   }
   OnPaintFocusBorder(canvas);
 }
@@ -120,6 +109,29 @@ gfx::ImageSkia ImageButton::GetImageToPaint() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+// ImageButton, private:
+
+gfx::Point ImageButton::ComputeImagePaintPosition(const gfx::ImageSkia& image) {
+  int x = 0, y = 0;
+  gfx::Rect rect = GetContentsBounds();
+
+  if (h_alignment_ == ALIGN_CENTER)
+    x = (rect.width() - image.width()) / 2;
+  else if (h_alignment_ == ALIGN_RIGHT)
+    x = rect.width() - image.width();
+
+  if (v_alignment_ == ALIGN_MIDDLE)
+    y = (rect.height() - image.height()) / 2;
+  else if (v_alignment_ == ALIGN_BOTTOM)
+    y = rect.height() - image.height();
+
+  x += rect.x();
+  y += rect.y();
+
+  return gfx::Point(x, y);
+}
+
+////////////////////////////////////////////////////////////////////////////////
 // ToggleImageButton, public:
 
 ToggleImageButton::ToggleImageButton(ButtonListener* listener)
diff --git a/ui/views/controls/button/image_button.h b/ui/views/controls/button/image_button.h
index 215a9ac..e34e176 100644
--- a/ui/views/controls/button/image_button.h
+++ b/ui/views/controls/button/image_button.h
@@ -79,6 +79,10 @@ class VIEWS_EXPORT ImageButton : public CustomButton {
 
  private:
   FRIEND_TEST_ALL_PREFIXES(ImageButtonTest, Basics);
+  FRIEND_TEST_ALL_PREFIXES(ImageButtonTest, ImagePositionWithBorder);
+
+  // Returns the correct position of the image for painting.
+  gfx::Point ComputeImagePaintPosition(const gfx::ImageSkia& image);
 
   // Image alignment.
   HorizontalAlignment h_alignment_;
diff --git a/ui/views/controls/button/image_button_unittest.cc b/ui/views/controls/button/image_button_unittest.cc
index f95eb74..9b71964 100644
--- a/ui/views/controls/button/image_button_unittest.cc
+++ b/ui/views/controls/button/image_button_unittest.cc
@@ -80,4 +80,31 @@ TEST_F(ImageButtonTest, Basics) {
   EXPECT_TRUE(button.overlay_image_.isNull());
 }
 
+TEST_F(ImageButtonTest, ImagePositionWithBorder) {
+  ImageButton button(NULL);
+  gfx::ImageSkia image = CreateTestImage(20, 30);
+  button.SetImage(CustomButton::BS_NORMAL, &image);
+
+  // The image should be painted at the top-left corner.
+  EXPECT_EQ(gfx::Point().ToString(),
+            button.ComputeImagePaintPosition(image).ToString());
+
+  button.set_border(views::Border::CreateEmptyBorder(10, 5, 0, 0));
+  EXPECT_EQ(gfx::Point(5, 10).ToString(),
+            button.ComputeImagePaintPosition(image).ToString());
+
+  button.set_border(NULL);
+  button.SetBounds(0, 0, 50, 50);
+  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.set_border(views::Border::CreateEmptyBorder(10, 10, 0, 0));
+  EXPECT_EQ(gfx::Point(20, 15).ToString(),
+            button.ComputeImagePaintPosition(image).ToString());
+}
+
 }  // namespace views