chrome/browser/ui/views/toolbar/toolbar_button.cc - Issue 1373983002: Enhanced the InkDropRippleImpl to create/destroy InkDropAnimations as needed.

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: chrome/browser/ui/views/toolbar/toolbar_button.cc

Issue 1373983002: Enhanced the InkDropRippleImpl to create/destroy InkDropAnimations as needed. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed merge with master. Created 5 years, 2 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:

View side-by-side diff with in-line comments

Download patch

Index: chrome/browser/ui/views/toolbar/toolbar_button.cc

diff --git a/chrome/browser/ui/views/toolbar/toolbar_button.cc b/chrome/browser/ui/views/toolbar/toolbar_button.cc

index e006dd5159f11d95571745f08577c503132ffba6..33cfcd013c9dc9d0e64e3a372ebb59925614c3ab 100644

--- a/chrome/browser/ui/views/toolbar/toolbar_button.cc

+++ b/chrome/browser/ui/views/toolbar/toolbar_button.cc

@@ -144,7 +144,8 @@ void ToolbarButton::OnMouseReleased(const ui::MouseEvent& event) {

if (IsTriggerableEvent(event))

show_menu_factory_.InvalidateWeakPtrs();

- ink_drop_animation_controller_->AnimateToState(views::InkDropState::HIDDEN);

+ if (!HitTestPoint(event.location()))

+ ink_drop_animation_controller_->AnimateToState(views::InkDropState::HIDDEN);

}

void ToolbarButton::OnMouseCaptureLost() {

« no previous file with comments | « no previous file | ui/views/animation/ink_drop_animation.h » ('j') | no next file with comments »