ui/views/animation/square_ink_drop_ripple.cc - Issue 2340993002: Tweaks to "Allow InkDropRipple to co-exist with highlight or not exist at all."

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/views/animation/square_ink_drop_ripple.cc

Issue 2340993002: Tweaks to "Allow InkDropRipple to co-exist with highlight or not exist at all." (Closed)

Patch Set: Fixed InkDropImplTest.HighlightCanExistWithoutRipple. Created 4 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: ui/views/animation/square_ink_drop_ripple.cc

diff --git a/ui/views/animation/square_ink_drop_ripple.cc b/ui/views/animation/square_ink_drop_ripple.cc

index a01bbfd12bb2ce86460622cbb8d31fadb925e8d9..49fd5512e24f73f23d4c3f065aa0a3b856a8920b 100644

--- a/ui/views/animation/square_ink_drop_ripple.cc

+++ b/ui/views/animation/square_ink_drop_ripple.cc

@@ -214,8 +214,8 @@ ui::Layer* SquareInkDropRipple::GetRootLayer() {

return &root_layer_;

}

-bool SquareInkDropRipple::IsVisible() const {

- return root_layer_.visible();

+bool SquareInkDropRipple::OverridesHighlight() const {

+ return true;

}

float SquareInkDropRipple::GetCurrentOpacity() const {