Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(823)

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

Issue 2095873004: Ink drops with touch input are redundant on Windows since the OS does something similar (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/animation/ink_drop_host_view.cc
diff --git a/ui/views/animation/ink_drop_host_view.cc b/ui/views/animation/ink_drop_host_view.cc
index e6b1e424155d41e75056cdf1744fc2e7e2684fcc..6053bf70d26a9f3f903d4753620e1d9c697d28c1 100644
--- a/ui/views/animation/ink_drop_host_view.cc
+++ b/ui/views/animation/ink_drop_host_view.cc
@@ -172,6 +172,15 @@ gfx::Point InkDropHostView::GetInkDropCenterBasedOnLastEvent() const {
void InkDropHostView::AnimateInkDrop(InkDropState state,
const ui::LocatedEvent* event) {
+#if defined(OS_WIN)
+ if ((state == InkDropState::ACTION_PENDING ||
sky 2016/06/24 19:21:11 Is there a reason why you care about the state in
Evan Stade 2016/06/24 20:28:30 I imagine this is to handle cases like if you were
kylix_rd 2016/06/24 20:32:18 Only certain states or actions should be allowed t
+ state == InkDropState::ALTERNATE_ACTION_PENDING ||
+ ((state == InkDropState::ACTION_TRIGGERED ||
+ state == InkDropState::ALTERNATE_ACTION_TRIGGERED) &&
+ ink_drop_->GetTargetInkDropState() == InkDropState::HIDDEN)) &&
+ event && event->IsGestureEvent())
+ return;
+#endif
last_ripple_triggering_event_.reset(
event ? ui::Event::Clone(*event).release()->AsLocatedEvent() : nullptr);
ink_drop_->AnimateToState(state);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698