dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

efl/gesture: use new config value for thumbscroll friction 

the old one used here is marked deprecated

Reviewed-by: Marcel Hollerbach <mail@marcel-hollerbach.de>
Differential Revision: https://phab.enlightenment.org/D11263
This commit is contained in:
Mike Blumenkrantz 2020-01-31 09:55:06 -05:00 committed by Marcel Hollerbach
parent a59956680d
commit 23f772b434
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/lib/evas/gesture/efl_canvas_gesture_recognizer_flick.c
View File

@ -41,7 +41,7 @@ _momentum_set(Eo *obj,
Evas_Coord dy = v2.y - v1.y;
int dt = t2 - t1;
Eina_Value *tf, *tmt;
double thumbscroll_friction, thumbscroll_momentum_threshold;
double thumbscroll_momentum_friction, thumbscroll_momentum_threshold;
if (dt > 0)
{
@ -51,15 +51,15 @@ _momentum_set(Eo *obj,
vel = sqrt((velx * velx) + (vely * vely));
tf = _recognizer_config_get(obj, "thumbscroll_friction");
if (tf) eina_value_get(tf, &thumbscroll_friction);
else thumbscroll_friction = THUMBSCROLL_FRICTION;
tf = _recognizer_config_get(obj, "thumbscroll_momentum_friction");
if (tf) eina_value_get(tf, &thumbscroll_momentum_friction);
else thumbscroll_momentum_friction = THUMBSCROLL_FRICTION;
tmt = _recognizer_config_get(obj, "thumbscroll_momentum_threshold");
if (tmt) eina_value_get(tmt, &thumbscroll_momentum_threshold);
else thumbscroll_momentum_threshold = THUMBSCROLL_MOMENTUM_THRESHOLD;
if ((thumbscroll_friction > 0.0) &&
if ((thumbscroll_momentum_friction > 0.0) &&
(vel > thumbscroll_momentum_threshold)) /* report
* momentum */
{

10
src/lib/evas/gesture/efl_canvas_gesture_recognizer_momentum.c
View File

@ -26,7 +26,7 @@ _momentum_set(Eo *obj,
Evas_Coord dy = v2.y - v1.y;
int dt = t2 - t1;
Eina_Value *tf, *tmt;
double thumbscroll_friction, thumbscroll_momentum_threshold;
double thumbscroll_momentum_friction, thumbscroll_momentum_threshold;
if (dt > 0)
{
@ -36,15 +36,15 @@ _momentum_set(Eo *obj,
vel = sqrt((velx * velx) + (vely * vely));
tf = _recognizer_config_get(obj, "thumbscroll_friction");
if (tf) eina_value_get(tf, &thumbscroll_friction);
else thumbscroll_friction = THUMBSCROLL_FRICTION;
tf = _recognizer_config_get(obj, "thumbscroll_momentum_friction");
if (tf) eina_value_get(tf, &thumbscroll_momentum_friction);
else thumbscroll_momentum_friction = THUMBSCROLL_FRICTION;
tmt = _recognizer_config_get(obj, "thumbscroll_momentum_threshold");
if (tmt) eina_value_get(tmt, &thumbscroll_momentum_threshold);
else thumbscroll_momentum_threshold = THUMBSCROLL_MOMENTUM_THRESHOLD;
if ((thumbscroll_friction > 0.0) &&
if ((thumbscroll_momentum_friction > 0.0) &&
(vel > thumbscroll_momentum_threshold)) /* report
* momentum */
{