summaryrefslogtreecommitdiffstats
path: root/ui/events/gesture_detection/scale_gesture_detector.h
diff options
context:
space:
mode:
Diffstat (limited to 'ui/events/gesture_detection/scale_gesture_detector.h')
-rw-r--r--ui/events/gesture_detection/scale_gesture_detector.h16
1 files changed, 11 insertions, 5 deletions
diff --git a/ui/events/gesture_detection/scale_gesture_detector.h b/ui/events/gesture_detection/scale_gesture_detector.h
index 2d83ca1..08b6288 100644
--- a/ui/events/gesture_detection/scale_gesture_detector.h
+++ b/ui/events/gesture_detection/scale_gesture_detector.h
@@ -24,9 +24,15 @@ class ScaleGestureDetector : public GestureDetector::SimpleGestureListener {
Config();
~Config();
GestureDetector::Config gesture_detector_config;
+
+ // Minimum accepted value for TouchMajor while scaling (in dips).
+ float min_scaling_touch_major;
+
+ // Minimum span needed to initiate a scaling gesture (in dips).
+ float min_scaling_span;
+
+ // Whether double-tap drag scaling is enabled.
bool quick_scale_enabled;
- int min_scaling_touch_major;
- int min_scaling_span;
};
class ScaleGestureListener {
@@ -120,8 +126,8 @@ class ScaleGestureDetector : public GestureDetector::SimpleGestureListener {
base::TimeTicks curr_time_;
base::TimeTicks prev_time_;
bool in_progress_;
- int span_slop_;
- int min_span_;
+ float span_slop_;
+ float min_span_;
// Bounds for recently seen values.
float touch_upper_;
@@ -129,7 +135,7 @@ class ScaleGestureDetector : public GestureDetector::SimpleGestureListener {
float touch_history_last_accepted_;
int touch_history_direction_;
base::TimeTicks touch_history_last_accepted_time_;
- int touch_min_major_;
+ float touch_min_major_;
float double_tap_focus_x_;
float double_tap_focus_y_;
DoubleTapMode double_tap_mode_;