Indicate focused state on text buttons with blue outline.

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"
@@ skipping 25 matching lines @@
 static const int kDefaultIconTextSpacing = 5;
 
 // Preferred padding between text and edge.
 static const int kPreferredPaddingHorizontal = 6;
 static const int kPreferredPaddingVertical = 5;
 
 // Preferred padding between text and edge for NativeTheme border.
 static const int kPreferredNativeThemePaddingHorizontal = 12;
 static const int kPreferredNativeThemePaddingVertical = 5;
 
-// By default the focus rect is drawn at the border of the view.
-// For a button, we inset the focus rect by 3 pixels so that it
-// doesn't draw on top of the button's border. This roughly matches
-// how the Windows native focus rect for buttons looks. A subclass
-// that draws a button with different padding may need to
-// override OnPaintFocusBorder and do something different.
-static const int kFocusRectInset = 3;
-
 // How long the hover fade animation should last.
 static const int kHoverAnimationDurationMs = 170;
 
 // static
 const char TextButtonBase::kViewClassName[] = "views/TextButtonBase";
 // static
 const char TextButton::kViewClassName[] = "views/TextButton";
 // static
 const char NativeTextButton::kViewClassName[] = "views/NativeTextButton";
 
@@ skipping 399 matching lines @@
 
   return flags;
 }
 
 void TextButtonBase::GetExtraParams(
     ui::NativeTheme::ExtraParams* params) const {
   params->button.checked = false;
   params->button.indeterminate = false;
   params->button.is_default = false;
   params->button.has_border = false;
+  params->button.is_focused = HasFocus();
   params->button.classic_state = 0;
   params->button.background_color =
       ui::NativeTheme::instance()->GetSystemColor(
           ui::NativeTheme::kColorId_TextButtonBackgroundColor);
 }
 
 gfx::Rect TextButtonBase::GetContentBounds(int extra_width) const {
   gfx::Insets insets = GetInsets();
   int available_width = width() - insets.width();
   int content_width = text_size_.width() + extra_width;
@@ skipping 266 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())) {

[tony, 2012/06/04 19:20:45]

Is it OK to lose the focusable() || IsAccessibilityFocusable() checks?

[xiyuan, 2012/06/04 19:46:54]

I have the same question.
Should we do "params->button.is_focused = HasFocus() && (focusable() ||
IsAccessibilityFocusable())" in TextButtonBase::GetExtraParams as in here?

[flackr, 2012/06/05 14:13:18]

You're absolutely right, I originally had this and it got lost somewhere. Added
these. Thanks

-    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_;
 }
@@ skipping 62 matching lines @@
 
 gfx::Size NativeTextButton::GetMinimumSize() {
   return GetPreferredSize();
 }
 
 std::string NativeTextButton::GetClassName() const {
   return kViewClassName;
 }
 
 void NativeTextButton::OnPaintFocusBorder(gfx::Canvas* canvas) {
-#if defined(OS_WIN)

[xiyuan, 2012/06/04 19:46:54]

Would this break Windows?

[flackr, 2012/06/05 14:13:18]

I tried in Windows (7) and it draws a similar looking blue colored focus border
drawn by NativeThemeWin::PaintButton I believe. Nevertheless to be safe I'll
keep the existing functionality for windows and the base TextButton (since this
doesn't use NativeTheme I believe), and only override NativeTextButton's
behaviour.

-  if (HasFocus() && (focusable() || IsAccessibilityFocusable())) {
-    gfx::Rect rect(GetLocalBounds());
-    rect.Inset(kFocusRectInset, kFocusRectInset);
-    canvas->DrawFocusRect(rect);
-  }
-#else
-  TextButton::OnPaintFocusBorder(canvas);
-#endif
 }
 
 void NativeTextButton::GetExtraParams(
     ui::NativeTheme::ExtraParams* params) const {
   TextButton::GetExtraParams(params);
   params->button.has_border = true;
 }
 
 }  // namespace views