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

Unified Diff: ui/views/controls/slider.cc

Issue 404213003: [WIP] Allow scroll events to permanently change the default gesture handler in RootView (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: friend test Created 6 years, 5 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: ui/views/controls/slider.cc
diff --git a/ui/views/controls/slider.cc b/ui/views/controls/slider.cc
index 74e803d454b284e21e75f7752e417fe01cbac44b..72890625d23502b327d62fb7c43504915f7f2a12 100644
--- a/ui/views/controls/slider.cc
+++ b/ui/views/controls/slider.cc
@@ -317,7 +317,7 @@ void Slider::OnBlur() {
void Slider::OnGestureEvent(ui::GestureEvent* event) {
switch (event->type()) {
- // In a multi point gesture only the touch point will generate
+ // In a multi point gesture only the (first?) touch point will generate
sadrul 2014/07/24 19:12:13 yes. Looks like someone accidentally the word.
// an ET_GESTURE_TAP_DOWN event.
case ui::ET_GESTURE_TAP_DOWN:
OnSliderDragStarted();
@@ -328,12 +328,19 @@ void Slider::OnGestureEvent(ui::GestureEvent* event) {
MoveButtonTo(event->location());
event->SetHandled();
break;
- case ui::ET_GESTURE_END:
+ case ui::ET_GESTURE_SCROLL_END:
+ case ui::ET_SCROLL_FLING_START:
+ case ui::ET_GESTURE_TAP:
MoveButtonTo(event->location());
event->SetHandled();
if (event->details().touch_points() <= 1)
OnSliderDragEnded();
break;
+ case ui::ET_GESTURE_TWO_FINGER_TAP:
+ MoveButtonTo(event->location());
+ event->SetHandled();
+ OnSliderDragEnded();
+ break;
sadrul 2014/07/24 19:12:13 Is this necessary?
default:
break;
}

Powered by Google App Engine
This is Rietveld 408576698