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, 3 insertions, 3 deletions

diff --git a/src/gestures-pinch.c b/src/gestures-pinch.c
index bc5db1f..facb952 100644
--- a/src/gestures-pinch.c
+++ b/src/gestures-pinch.c
@@ -40,9 +40,9 @@ static void set_props(const struct gesture_inserter *gin,
                       const struct move_model *m,
                       const struct utouch_frame *frame)
 {
-        s->prop[GRAIL_PROP_PINCH_DR] = gin->scale_r * m->fm[FM_R].action_delta;
-        s->prop[GRAIL_PROP_PINCH_VR] = gin->scale_r * m->fm[FM_R].velocity;
-        s->prop[GRAIL_PROP_PINCH_R] = gin->scale_r * m->fm[FM_R].value;
+        s->prop[GRAIL_PROP_PINCH_DR] = m->fm[FM_R].action_delta;
+        s->prop[GRAIL_PROP_PINCH_VR] = m->fm[FM_R].velocity;
+        s->prop[GRAIL_PROP_PINCH_R] = m->fm[FM_R].value;
         s->nprop = 3;
         s->nprop += gin_add_contact_props(gin, s->prop + s->nprop, frame);
 }