Views: Don't add insets for views::Link focus rings under MD.

ui/views/controls/link.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/link.h"
 
 #include "build/build_config.h"
 
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/base/cursor/cursor.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/events/event.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/font_list.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/controls/link_listener.h"
 #include "ui/views/native_cursor.h"
 #include "ui/views/style/platform_style.h"
 
 namespace views {
 
 const char Link::kViewClassName[] = "Link";
+constexpr int Link::kFocusBorderPadding;
 
 Link::Link() : Link(base::string16()) {}
 
 Link::Link(const base::string16& title)
     : Label(title),
       requested_enabled_color_(gfx::kPlaceholderColor),
       requested_enabled_color_set_(false) {
   Init();
 }
 
 Link::~Link() {
 }
 
+// static
+Link::FocusStyle Link::GetDefaultFocusStyle() {
+  return ui::MaterialDesignController::IsSecondaryUiMaterial()
+             ? FocusStyle::UNDERLINE
+             : FocusStyle::RING;
+}
+
+Link::FocusStyle Link::GetFocusStyle() const {
+  // If the link is "permanently" underlined use a ring to indicate focus.
+  return underline_ ? FocusStyle::RING : FocusStyle::UNDERLINE;
+}
+
+void Link::MaybePaintFocusRing(gfx::Canvas* canvas) const {
+  if (GetFocusStyle() == FocusStyle::RING)
+    canvas->DrawFocusRect(GetFocusRingBounds());
+}
+
+gfx::Insets Link::GetInsets() const {
+  gfx::Insets insets = Label::GetInsets();
+  if (GetFocusStyle() == FocusStyle::RING &&
+      focus_behavior() != FocusBehavior::NEVER) {
+    DCHECK(!text().empty());
+    insets += gfx::Insets(kFocusBorderPadding);
+  }
+  return insets;
+}
+
 const char* Link::GetClassName() const {
   return kViewClassName;
 }
 
 gfx::NativeCursor Link::GetCursor(const ui::MouseEvent& event) {
   if (!enabled())
     return gfx::kNullCursor;
   return GetNativeHandCursor();
 }
 
@@ skipping 134 matching lines @@
 void Link::SetUnderline(bool underline) {
   if (underline_ == underline)
     return;
   underline_ = underline;
   RecalculateFont();
 }
 
 void Link::Init() {
   listener_ = NULL;
   pressed_ = false;
-  underline_ = !ui::MaterialDesignController::IsSecondaryUiMaterial();
+  underline_ = GetDefaultFocusStyle() != FocusStyle::UNDERLINE;
   RecalculateFont();
 
   // Label::Init() calls SetText(), but if that's being called from Label(), our
   // SetText() override will not be reached (because the constructed class is
   // only a Label at the moment, not yet a Link).  So explicitly configure focus
   // here.
   ConfigureFocus();
 }
 
 void Link::SetPressed(bool pressed) {
   if (pressed_ != pressed) {
     pressed_ = pressed;
     Label::SetEnabledColor(GetEnabledColor());
     RecalculateFont();
     SchedulePaint();
   }
 }
 
 void Link::RecalculateFont() {
   // Underline the link if it is enabled and |underline_| is true. Also
-  // underline to indicate focus in MD.
+  // underline to indicate focus when that's the style.
   const int style = font_list().GetFontStyle();
   const bool underline =
-      underline_ ||
-      (HasFocus() && ui::MaterialDesignController::IsSecondaryUiMaterial());
+      underline_ || (HasFocus() && GetFocusStyle() == FocusStyle::UNDERLINE);
   const int intended_style = (enabled() && underline) ?
       (style | gfx::Font::UNDERLINE) : (style & ~gfx::Font::UNDERLINE);
 
   if (style != intended_style)
     Label::SetFontList(font_list().DeriveWithStyle(intended_style));
 }
 
 void Link::ConfigureFocus() {
-  // Disable focusability for empty links.  Otherwise Label::GetInsets() will
-  // give them an unconditional 1-px. inset on every side to allow for a focus
-  // border, when in this case we probably wanted zero width.
+  // Disable focusability for empty links.
   if (text().empty()) {
     SetFocusBehavior(FocusBehavior::NEVER);
   } else {
 #if defined(OS_MACOSX)
     SetFocusBehavior(FocusBehavior::ACCESSIBLE_ONLY);
 #else
     SetFocusBehavior(FocusBehavior::ALWAYS);
 #endif
   }
 }
 
 SkColor Link::GetEnabledColor() {
   if (requested_enabled_color_set_)
     return requested_enabled_color_;
 
   if (GetNativeTheme()) {
     return GetNativeTheme()->GetSystemColor(
         pressed_ ? ui::NativeTheme::kColorId_LinkPressed
                  : ui::NativeTheme::kColorId_LinkEnabled);
   }
 
   return gfx::kPlaceholderColor;
 }
 
 }  // namespace views