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

Side by Side Diff: ui/events/gesture_detection/gesture_config_helper_aura.cc

Issue 243403002: Add multi-finger swipe detection to GestureDetector (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Test three finger swipe Created 6 years, 8 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/events/gesture_detection/gesture_config_helper.h" 5 #include "ui/events/gesture_detection/gesture_config_helper.h"
6 6
7 #include "ui/events/gestures/gesture_configuration.h" 7 #include "ui/events/gestures/gesture_configuration.h"
8 #include "ui/gfx/screen.h" 8 #include "ui/gfx/screen.h"
9 9
10 namespace ui { 10 namespace ui {
11 namespace { 11 namespace {
12 12
13 GestureDetector::Config DefaultGestureDetectorConfig() { 13 GestureDetector::Config DefaultGestureDetectorConfig() {
14 GestureDetector::Config config; 14 GestureDetector::Config config;
15 15
16 config.longpress_timeout = base::TimeDelta::FromMilliseconds( 16 config.longpress_timeout = base::TimeDelta::FromMilliseconds(
17 GestureConfiguration::long_press_time_in_seconds() * 1000.); 17 GestureConfiguration::long_press_time_in_seconds() * 1000.);
18 config.showpress_timeout = base::TimeDelta::FromMilliseconds( 18 config.showpress_timeout = base::TimeDelta::FromMilliseconds(
19 GestureConfiguration::show_press_delay_in_ms()); 19 GestureConfiguration::show_press_delay_in_ms());
20 config.double_tap_timeout = base::TimeDelta::FromMilliseconds( 20 config.double_tap_timeout = base::TimeDelta::FromMilliseconds(
21 GestureConfiguration::semi_long_press_time_in_seconds() * 1000.); 21 GestureConfiguration::semi_long_press_time_in_seconds() * 1000.);
22 config.touch_slop = 22 config.touch_slop =
23 GestureConfiguration::max_touch_move_in_pixels_for_click(); 23 GestureConfiguration::max_touch_move_in_pixels_for_click();
24 config.double_tap_slop = 24 config.double_tap_slop =
25 GestureConfiguration::max_distance_between_taps_for_double_tap(); 25 GestureConfiguration::max_distance_between_taps_for_double_tap();
26 config.minimum_fling_velocity = 26 config.minimum_fling_velocity =
27 GestureConfiguration::min_scroll_velocity(); 27 GestureConfiguration::min_scroll_velocity();
28 config.maximum_fling_velocity = 28 config.maximum_fling_velocity =
29 GestureConfiguration::fling_velocity_cap(); 29 GestureConfiguration::fling_velocity_cap();
30 config.swipe_enabled = true;
31 config.minimum_swipe_velocity = GestureConfiguration::min_swipe_speed();
32 config.minimum_swipe_direction_ratio =
tdresser 2014/04/22 15:27:16 This name isn't great, nor was the previous one.
jdduke (slow) 2014/04/24 00:54:29 Yeah that's better, though I'll probably cache the
33 GestureConfiguration::max_swipe_deviation_ratio();
30 34
31 return config; 35 return config;
32 } 36 }
33 37
34 ScaleGestureDetector::Config DefaultScaleGestureDetectorConfig() { 38 ScaleGestureDetector::Config DefaultScaleGestureDetectorConfig() {
35 ScaleGestureDetector::Config config; 39 ScaleGestureDetector::Config config;
36 40
37 config.gesture_detector_config = DefaultGestureDetectorConfig(); 41 config.gesture_detector_config = DefaultGestureDetectorConfig();
38 config.min_scaling_touch_major = GestureConfiguration::default_radius() * 2; 42 config.min_scaling_touch_major = GestureConfiguration::default_radius() * 2;
39 config.min_scaling_span = 43 config.min_scaling_span =
40 GestureConfiguration::min_distance_for_pinch_scroll_in_pixels(); 44 GestureConfiguration::min_distance_for_pinch_scroll_in_pixels();
41 return config; 45 return config;
42 } 46 }
43 47
44 } // namespace 48 } // namespace
45 49
46 GestureProvider::Config DefaultGestureProviderConfig() { 50 GestureProvider::Config DefaultGestureProviderConfig() {
47 GestureProvider::Config config; 51 GestureProvider::Config config;
48 config.display = gfx::Screen::GetNativeScreen()->GetPrimaryDisplay(); 52 config.display = gfx::Screen::GetNativeScreen()->GetPrimaryDisplay();
49 config.gesture_detector_config = DefaultGestureDetectorConfig(); 53 config.gesture_detector_config = DefaultGestureDetectorConfig();
50 config.scale_gesture_detector_config = DefaultScaleGestureDetectorConfig(); 54 config.scale_gesture_detector_config = DefaultScaleGestureDetectorConfig();
51 config.gesture_begin_end_types_enabled = true; 55 config.gesture_begin_end_types_enabled = true;
52 return config; 56 return config;
53 } 57 }
54 58
55 } // namespace ui 59 } // namespace ui
OLDNEW
« no previous file with comments | « no previous file | ui/events/gesture_detection/gesture_detector.h » ('j') | ui/events/gesture_detection/gesture_detector.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698