Add GetMinimumSize() for Borders, and make LabelButton auto-size to at least as

ui/views/border.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/border.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/painter.h"
 
 namespace views {
 
 namespace {
 
 // A simple border with different thicknesses on each side and single color.
 class SidedSolidBorder : public Border {
  public:
   SidedSolidBorder(int top, int left, int bottom, int right, SkColor color);
 
   // Overridden from Border:
   virtual void Paint(const View& view, gfx::Canvas* canvas) OVERRIDE;
   virtual gfx::Insets GetInsets() const OVERRIDE;
+  virtual gfx::Size GetMinimumSize() const OVERRIDE;
 
  private:
   const SkColor color_;
   const gfx::Insets insets_;
 
   DISALLOW_COPY_AND_ASSIGN(SidedSolidBorder);
 };
 
 SidedSolidBorder::SidedSolidBorder(int top,
                                    int left,
@@ skipping 14 matching lines @@
                              insets_.bottom()), color_);
   // Right border.
   canvas->FillRect(gfx::Rect(view.width() - insets_.right(), 0, insets_.right(),
                              view.height()), color_);
 }
 
 gfx::Insets SidedSolidBorder::GetInsets() const {
   return insets_;
 }
 
+gfx::Size SidedSolidBorder::GetMinimumSize() const {
+  return gfx::Size(insets_.width(), insets_.height());
+}
+
 // A variation of SidedSolidBorder, where each side has the same thickness.
 class SolidBorder : public SidedSolidBorder {
  public:
   SolidBorder(int thickness, SkColor color)
       : SidedSolidBorder(thickness, thickness, thickness, thickness, color) {
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SolidBorder);
 };
 
 class EmptyBorder : public Border {
  public:
   EmptyBorder(int top, int left, int bottom, int right)
       : insets_(top, left, bottom, right) {}
 
   // Overridden from Border:
   virtual void Paint(const View& view, gfx::Canvas* canvas) OVERRIDE {}
 
   virtual gfx::Insets GetInsets() const OVERRIDE {
     return insets_;
   }
 
+  virtual gfx::Size GetMinimumSize() const OVERRIDE {
+    return gfx::Size();

[msw, 2013/11/22 18:00:25]

nit: shouldn't this match the insets? Empty means transparent, not unsized.

[Peter Kasting, 2013/11/22 22:07:55]

As noted previously, GetMinimumSize() should only be big enough for the border
to draw without error.  This does no drawing and thus needs no size.

+  }
+
  private:
   const gfx::Insets insets_;
 
   DISALLOW_COPY_AND_ASSIGN(EmptyBorder);
 };
 
 class BorderPainter : public Border {
  public:
   explicit BorderPainter(Painter* painter, const gfx::Insets& insets)
       : painter_(painter),
         insets_(insets) {
     DCHECK(painter);
   }
 
   virtual ~BorderPainter() {}
 
   // Overridden from Border:
   virtual void Paint(const View& view, gfx::Canvas* canvas) OVERRIDE {
     Painter::PaintPainterAt(canvas, painter_.get(), view.GetLocalBounds());
   }
 
   virtual gfx::Insets GetInsets() const OVERRIDE {
     return insets_;
   }
 
+  virtual gfx::Size GetMinimumSize() const OVERRIDE {
+    return painter_->GetMinimumSize();
+  }
+
  private:
   scoped_ptr<Painter> painter_;
   const gfx::Insets insets_;
 
   DISALLOW_COPY_AND_ASSIGN(BorderPainter);
 };
 
 }  // namespace
 
 Border::Border() {
@@ skipping 29 matching lines @@
 
 TextButtonBorder* Border::AsTextButtonBorder() {
   return NULL;
 }
 
 const TextButtonBorder* Border::AsTextButtonBorder() const {
   return NULL;
 }
 
 }  // namespace views