Commit aa6fc088 authored by Peter Boström's avatar Peter Boström Committed by Commit Bot

Show InkDrops on toolbar-button focus outside Mac

Highlights the ToolbarButton inkdrop on platforms where focus rings are
not used. Before this change toolbar buttons were not highlighted to
reflect their focused state (outside of Mac where focus rings are used).

Bug: chromium:856505
Change-Id: Iab3578ff75a12477afa11ce34a09836acc3514d9
Reviewed-on: https://chromium-review.googlesource.com/1115737Reviewed-by: default avatarBret Sepulveda <bsep@chromium.org>
Commit-Queue: Peter Boström <pbos@chromium.org>
Cr-Commit-Position: refs/heads/master@{#570561}
parent 1ce3b2f4
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#include "ui/views/animation/ink_drop_impl.h" #include "ui/views/animation/ink_drop_impl.h"
#include "ui/views/animation/ink_drop_mask.h" #include "ui/views/animation/ink_drop_mask.h"
#include "ui/views/animation/ink_drop_ripple.h" #include "ui/views/animation/ink_drop_ripple.h"
#include "ui/views/style/platform_style.h"
constexpr float kToolbarInkDropVisibleOpacity = 0.06f; constexpr float kToolbarInkDropVisibleOpacity = 0.06f;
constexpr float kToolbarInkDropHighlightVisibleOpacity = 0.08f; constexpr float kToolbarInkDropHighlightVisibleOpacity = 0.08f;
...@@ -72,6 +73,8 @@ std::unique_ptr<views::InkDrop> CreateToolbarInkDrop( ...@@ -72,6 +73,8 @@ std::unique_ptr<views::InkDrop> CreateToolbarInkDrop(
ink_drop->SetAutoHighlightMode( ink_drop->SetAutoHighlightMode(
views::InkDropImpl::AutoHighlightMode::SHOW_ON_RIPPLE); views::InkDropImpl::AutoHighlightMode::SHOW_ON_RIPPLE);
ink_drop->SetShowHighlightOnHover(true); ink_drop->SetShowHighlightOnHover(true);
ink_drop->SetShowHighlightOnFocus(!views::PlatformStyle::kPreferFocusRings);
return ink_drop; return ink_drop;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment