summaryrefslogtreecommitdiff
path: root/src/gestures-drag.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/gestures-drag.c')
-rw-r--r--src/gestures-drag.c20
1 files changed, 8 insertions, 12 deletions
diff --git a/src/gestures-drag.c b/src/gestures-drag.c
index 41ded2c..a2819f2 100644
--- a/src/gestures-drag.c
+++ b/src/gestures-drag.c
@@ -38,20 +38,16 @@ static void set_props(const struct gesture_inserter *gin,
38 const struct utouch_frame *frame) 38 const struct utouch_frame *frame)
39{ 39{
40 if (m->single) { 40 if (m->single) {
41 s->prop[GRAIL_PROP_DRAG_DX] = 41 s->prop[GRAIL_PROP_DRAG_DX] = m->fm[FM_X].raw_delta;
42 gin->scale_x * m->fm[FM_X].raw_delta; 42 s->prop[GRAIL_PROP_DRAG_DY] = m->fm[FM_Y].raw_delta;
43 s->prop[GRAIL_PROP_DRAG_DY] =
44 gin->scale_y * m->fm[FM_Y].raw_delta;
45 } else { 43 } else {
46 s->prop[GRAIL_PROP_DRAG_DX] = 44 s->prop[GRAIL_PROP_DRAG_DX] = m->fm[FM_X].action_delta;
47 gin->scale_x * m->fm[FM_X].action_delta; 45 s->prop[GRAIL_PROP_DRAG_DY] = m->fm[FM_Y].action_delta;
48 s->prop[GRAIL_PROP_DRAG_DY] =
49 gin->scale_y * m->fm[FM_Y].action_delta;
50 } 46 }
51 s->prop[GRAIL_PROP_DRAG_VX] = gin->scale_x * m->fm[FM_X].velocity; 47 s->prop[GRAIL_PROP_DRAG_VX] = m->fm[FM_X].velocity;
52 s->prop[GRAIL_PROP_DRAG_VY] = gin->scale_y * m->fm[FM_Y].velocity; 48 s->prop[GRAIL_PROP_DRAG_VY] = m->fm[FM_Y].velocity;
53 s->prop[GRAIL_PROP_DRAG_X] = gin_prop_x(gin, m->fm[FM_X].value); 49 s->prop[GRAIL_PROP_DRAG_X] = m->fm[FM_X].value;
54 s->prop[GRAIL_PROP_DRAG_Y] = gin_prop_y(gin, m->fm[FM_Y].value); 50 s->prop[GRAIL_PROP_DRAG_Y] = m->fm[FM_Y].value;
55 s->nprop = 6; 51 s->nprop = 6;
56 s->nprop += gin_add_contact_props(gin, s->prop + s->nprop, frame); 52 s->nprop += gin_add_contact_props(gin, s->prop + s->nprop, frame);
57} 53}