summaryrefslogtreecommitdiffstats
path: root/ui/base/gestures
diff options
context:
space:
mode:
authorrjkroege@chromium.org <rjkroege@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-26 11:54:13 +0000
committerrjkroege@chromium.org <rjkroege@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-26 11:54:13 +0000
commit225b6d78753087dbd3ca0c2aa8a985109ef2fb1a (patch)
tree796d4a0fd3eb30134f61dcb3aa72840498357c22 /ui/base/gestures
parente509a17bbc857c26014248391699757eec6fd573 (diff)
downloadchromium_src-225b6d78753087dbd3ca0c2aa8a985109ef2fb1a.zip
chromium_src-225b6d78753087dbd3ca0c2aa8a985109ef2fb1a.tar.gz
chromium_src-225b6d78753087dbd3ca0c2aa8a985109ef2fb1a.tar.bz2
Slow touchscreen acceleration model and adjust default multiplier.
Touchscreen fling acceleration is excessive. Reduce and make eaiser to control. BUG=144674 Review URL: https://chromiumcodereview.appspot.com/10879070 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153396 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base/gestures')
-rw-r--r--ui/base/gestures/gesture_configuration.cc2
-rw-r--r--ui/base/gestures/gesture_sequence.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/ui/base/gestures/gesture_configuration.cc b/ui/base/gestures/gesture_configuration.cc
index a53685e..928f008 100644
--- a/ui/base/gestures/gesture_configuration.cc
+++ b/ui/base/gestures/gesture_configuration.cc
@@ -38,6 +38,6 @@ double GestureConfiguration::rail_start_proportion_ = 2;
// The additional acceleration to apply to touchscreen flings.
double GestureConfiguration::touchscreen_fling_acceleration_adjustment_
- = 1.f / 900.f;
+ = 1;
} // namespace ui
diff --git a/ui/base/gestures/gesture_sequence.cc b/ui/base/gestures/gesture_sequence.cc
index 7760a0d..b4d324d 100644
--- a/ui/base/gestures/gesture_sequence.cc
+++ b/ui/base/gestures/gesture_sequence.cc
@@ -280,7 +280,7 @@ float CalibrateFlingVelocity(float velocity) {
// http://crbug.com/120154
const float velocity_scaling =
GestureConfiguration::touchscreen_fling_acceleration_adjustment();
- return velocity_scaling * velocity * fabsf(velocity);
+ return velocity_scaling * velocity;
}
} // namespace