views: add focus ring to TreeView

ui/views/controls/scroll_view.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/scroll_view.h"
 
 #include "base/feature_list.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "ui/events/event.h"
 #include "ui/gfx/canvas.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
+#include "ui/views/controls/focus_ring.h"
 #include "ui/views/style/platform_style.h"
 #include "ui/views/widget/widget.h"
 
 namespace views {
 
 const char ScrollView::kViewClassName[] = "ScrollView";
 
 namespace {
 
 const base::Feature kToolkitViewsScrollWithLayers {
@@ skipping 239 matching lines @@
 }
 
 void ScrollView::SetVerticalScrollBar(ScrollBar* vert_sb) {
   DCHECK(vert_sb);
   vert_sb->SetVisible(vert_sb_->visible());
   delete vert_sb_;
   vert_sb->set_controller(this);
   vert_sb_ = vert_sb;
 }
 
+void ScrollView::SetHasFocusRing(bool has_focus_ring) {
+  if (has_focus_ring == bool(focus_ring_))

[sky, 2016/10/12 23:58:01]

Why not just focus_ring_?

[Elly Fong-Jones, 2016/10/13 11:14:56]

It doesn't compile:

../../ui/views/controls/scroll_view.cc:276:22: error: comparison between pointer
and integer ('int' and 'views::View *')

[sky, 2016/10/13 17:39:45]

My mistake.

+    return;
+  if (has_focus_ring) {
+    focus_ring_ = new FocusRing;
+    AddChildView(focus_ring_);
+    focus_ring_->Layout();
+  } else {
+    delete focus_ring_;
+    focus_ring_ = nullptr;
+  }
+}
+
 gfx::Size ScrollView::GetPreferredSize() const {
   if (!is_bounded())
     return View::GetPreferredSize();
 
   gfx::Size size = contents()->GetPreferredSize();
   size.SetToMax(gfx::Size(size.width(), min_height_));
   size.SetToMin(gfx::Size(size.width(), max_height_));
   gfx::Insets insets = GetInsets();
   size.Enlarge(insets.width(), insets.height());
   return size;
 }
 
 int ScrollView::GetHeightForWidth(int width) const {
   if (!is_bounded())
     return View::GetHeightForWidth(width);
 
   gfx::Insets insets = GetInsets();
   width = std::max(0, width - insets.width());
   int height = contents()->GetHeightForWidth(width) + insets.height();
   return std::min(std::max(height, min_height_), max_height_);
 }
 
 void ScrollView::Layout() {
+  if (focus_ring_)
+    focus_ring_->Layout();
+
   gfx::Rect available_rect = GetContentsBounds();
   if (is_bounded()) {
     int content_width = available_rect.width();
     int content_height = contents()->GetHeightForWidth(content_width);
     if (content_height > height()) {
       content_width = std::max(content_width - GetScrollBarWidth(), 0);
       content_height = contents()->GetHeightForWidth(content_width);
     }
     if (contents()->bounds().size() != gfx::Size(content_width, content_height))
       contents()->SetBounds(0, 0, content_width, content_height);
@@ skipping 459 matching lines @@
 
 VariableRowHeightScrollHelper::RowInfo
     FixedRowHeightScrollHelper::GetRowInfo(int y) {
   if (y < top_margin_)
     return RowInfo(0, top_margin_);
   return RowInfo((y - top_margin_) / row_height_ * row_height_ + top_margin_,
                  row_height_);
 }
 
 }  // namespace views