Convert to utouch-frame mapping

Remove the grail-internal mapping code and rely directly on
utouch-frame instead. Passes the unit test designed for this
change.

Signed-off-by: Henrik Rydberg <rydberg@euromail.se>

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,
                       const struct utouch_frame *frame)
 {
         if (m->single) {
-                s->prop[GRAIL_PROP_DRAG_DX] =
-                        gin->scale_x * m->fm[FM_X].raw_delta;
-                s->prop[GRAIL_PROP_DRAG_DY] =
-                        gin->scale_y * m->fm[FM_Y].raw_delta;
+                s->prop[GRAIL_PROP_DRAG_DX] = m->fm[FM_X].raw_delta;
+                s->prop[GRAIL_PROP_DRAG_DY] = m->fm[FM_Y].raw_delta;
         } else {
-                s->prop[GRAIL_PROP_DRAG_DX] =
-                        gin->scale_x * m->fm[FM_X].action_delta;
-                s->prop[GRAIL_PROP_DRAG_DY] =
-                        gin->scale_y * m->fm[FM_Y].action_delta;
+                s->prop[GRAIL_PROP_DRAG_DX] = m->fm[FM_X].action_delta;
+                s->prop[GRAIL_PROP_DRAG_DY] = m->fm[FM_Y].action_delta;
         }
-        s->prop[GRAIL_PROP_DRAG_VX] = gin->scale_x * m->fm[FM_X].velocity;
-        s->prop[GRAIL_PROP_DRAG_VY] = gin->scale_y * m->fm[FM_Y].velocity;
-        s->prop[GRAIL_PROP_DRAG_X] = gin_prop_x(gin, m->fm[FM_X].value);
-        s->prop[GRAIL_PROP_DRAG_Y] = gin_prop_y(gin, m->fm[FM_Y].value);
+        s->prop[GRAIL_PROP_DRAG_VX] = m->fm[FM_X].velocity;
+        s->prop[GRAIL_PROP_DRAG_VY] = m->fm[FM_Y].velocity;
+        s->prop[GRAIL_PROP_DRAG_X] = m->fm[FM_X].value;
+        s->prop[GRAIL_PROP_DRAG_Y] = m->fm[FM_Y].value;
         s->nprop = 6;
         s->nprop += gin_add_contact_props(gin, s->prop + s->nprop, frame);
 }