Update ConstrainedWindowViews appearance according to mock

ui/views/controls/button/text_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/text_button.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "grit/ui_resources.h"
 #include "ui/base/animation/throb_animation.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
 #include "ui/views/controls/button/button.h"
+#include "ui/views/focus_border.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(OS_WIN)
 #include "skia/ext/skia_utils_win.h"
 #include "ui/base/native_theme/native_theme_win.h"
 #include "ui/gfx/platform_font_win.h"
 #endif
 
 namespace views {
 
@@ skipping 234 matching lines @@
       color_highlight_(ui::NativeTheme::instance()->GetSystemColor(
           ui::NativeTheme::kColorId_TextButtonHighlightColor)),
       color_hover_(ui::NativeTheme::instance()->GetSystemColor(
           ui::NativeTheme::kColorId_TextButtonHoverColor)),
       text_halo_color_(0),
       has_text_halo_(false),
       active_text_shadow_color_(0),
       inactive_text_shadow_color_(0),
       has_shadow_(false),
       shadow_offset_(gfx::Point(1, 1)),
+      min_width_(0),
+      min_height_(0),
       max_width_(0),
       show_multiple_icon_states_(true),
       is_default_(false),
       multi_line_(false),
       prefix_type_(PREFIX_NONE) {
   SetText(text);
   SetAnimationDuration(kHoverAnimationDurationMs);
 }
 
 TextButtonBase::~TextButtonBase() {
@@ skipping 86 matching lines @@
   // In multiline mode max size can be undefined while
   // width() is 0, so max it out with current text size.
   gfx::Size prefsize(std::max(max_text_size_.width(),
                               text_size_.width()) + insets.width(),
                      std::max(max_text_size_.height(),
                               text_size_.height()) + insets.height());
 
   if (max_width_ > 0)
     prefsize.set_width(std::min(max_width_, prefsize.width()));
 
+  prefsize.set_width(std::max(prefsize.height(), min_width_));
+  prefsize.set_height(std::max(prefsize.height(), min_height_));
+
   return prefsize;
 }
 
 int TextButtonBase::GetHeightForWidth(int w) {
   if (!multi_line_)
     return View::GetHeightForWidth(w);
 
   if (max_width_ > 0)
     w = std::min(max_width_, w);
 
   gfx::Size text_size;
   CalculateTextSize(&text_size, w);
-  return text_size.height() + GetInsets().height();
+  int height = text_size.height() + GetInsets().height();
+
+  return std::max(height, min_height_);
 }
 
 void TextButtonBase::OnPaint(gfx::Canvas* canvas) {
   PaintButton(canvas, PB_NORMAL);
 }
 
 void TextButtonBase::OnBoundsChanged(const gfx::Rect& previous_bounds) {
   if (multi_line_)
     UpdateTextSize();
 }
@@ skipping 266 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 
 TextButton::TextButton(ButtonListener* listener, const string16& text)
     : TextButtonBase(listener, text),
       icon_placement_(ICON_ON_LEFT),
       has_hover_icon_(false),
       has_pushed_icon_(false),
       icon_text_spacing_(kDefaultIconTextSpacing),
       ignore_minimum_size_(true) {
   set_border(new TextButtonBorder);
+  set_focus_border(FocusBorder::CreateDashedFocusBorder(kFocusRectInset,
+                                                        kFocusRectInset,
+                                                        kFocusRectInset,
+                                                        kFocusRectInset));
 }
 
 TextButton::~TextButton() {
 }
 
 void TextButton::SetIcon(const gfx::ImageSkia& icon) {
   icon_ = icon;
   SchedulePaint();
 }
 
@@ skipping 28 matching lines @@
         static_cast<gfx::PlatformFontWin*>(font_.platform_font());
     prefsize.set_width(std::max(
         prefsize.width(),
         platform_font->horizontal_dlus_to_pixels(kMinWidthDLUs)));
     prefsize.set_height(std::max(
         prefsize.height(),
         platform_font->vertical_dlus_to_pixels(kMinHeightDLUs)));
   }
 #endif
 
+  prefsize.set_width(std::max(prefsize.height(), min_width_));

[hshi1, 2012/10/04 02:29:35]

Shouldn't the above be prefsize.set_width(std::max(prefsize.width(),
min_width_)); ??

+  prefsize.set_height(std::max(prefsize.height(), min_height_));
+
   return prefsize;
 }
 
 void TextButton::PaintButton(gfx::Canvas* canvas, PaintButtonMode mode) {
   TextButtonBase::PaintButton(canvas, mode);
 
   const gfx::ImageSkia& icon = GetImageToPaint();
 
   if (icon.width() > 0) {
     gfx::Rect text_bounds = GetTextBounds();
@@ skipping 20 matching lines @@
 }
 
 void TextButton::set_ignore_minimum_size(bool ignore_minimum_size) {
   ignore_minimum_size_ = ignore_minimum_size;
 }
 
 std::string TextButton::GetClassName() const {
   return kViewClassName;
 }
 
-void TextButton::OnPaintFocusBorder(gfx::Canvas* canvas) {
-  if (HasFocus() && (focusable() || IsAccessibilityFocusable())) {
-    gfx::Rect rect(GetLocalBounds());
-    rect.Inset(kFocusRectInset, kFocusRectInset);
-    canvas->DrawFocusRect(rect);
-  }
-}
-
 ui::NativeTheme::Part TextButton::GetThemePart() const {
   return ui::NativeTheme::kPushButton;
 }
 
 void TextButton::GetExtraParams(ui::NativeTheme::ExtraParams* params) const {
   TextButtonBase::GetExtraParams(params);
   params->button.is_default = is_default_;
 }
 
 gfx::Rect TextButton::GetTextBounds() const {
@@ skipping 46 matching lines @@
 
 void NativeTextButton::Init() {
 #if defined(OS_WIN)
   // Windows will like to show its own colors.
   // Halos and such are ignored as they are always set by specific calls.
   color_enabled_ = skia::COLORREFToSkColor(GetSysColor(COLOR_BTNTEXT));
   color_disabled_ = skia::COLORREFToSkColor(GetSysColor(COLOR_GRAYTEXT));
   color_hover_ = color_ = color_enabled_;
 #endif
   set_border(new TextButtonNativeThemeBorder(this));
+#if !defined(OS_WIN)
+  // Paint nothing, focus will be indicated with a border highlight drawn by
+  // NativeThemeBase::PaintButton.
+  set_focus_border(NULL);
+#endif
   set_ignore_minimum_size(false);
   set_alignment(ALIGN_CENTER);
   set_focusable(true);
 }
 
 gfx::Size NativeTextButton::GetMinimumSize() {
   return GetPreferredSize();
 }
 
 std::string NativeTextButton::GetClassName() const {
   return kViewClassName;
 }
 
-void NativeTextButton::OnPaintFocusBorder(gfx::Canvas* canvas) {
-#if defined(OS_WIN)
-  if (HasFocus() && (focusable() || IsAccessibilityFocusable())) {
-    gfx::Rect rect(GetLocalBounds());
-    rect.Inset(kFocusRectInset, kFocusRectInset);
-    canvas->DrawFocusRect(rect);
-  }
-#else
-  // Paint nothing, focus will be indicated with a border highlight drawn by
-  // NativeThemeBase::PaintButton.
-#endif
-}
-
 void NativeTextButton::GetExtraParams(
     ui::NativeTheme::ExtraParams* params) const {
   TextButton::GetExtraParams(params);
   params->button.has_border = true;
 #if !defined(OS_WIN)
   // Windows may paint a dotted focus rect in
   // NativeTextButton::OnPaintFocusBorder. To avoid getting two focus
   // indications (A dotted rect and a highlighted border) only set is_focused on
   // non windows platforms.
   params->button.is_focused = HasFocus() &&
       (focusable() || IsAccessibilityFocusable());
 #endif
 }
 
 }  // namespace views