From 1fb331ca738e92e5815fe8b7ce503c187f52fecc Mon Sep 17 00:00:00 2001 From: Henrik Rydberg Date: Mon, 14 Mar 2011 15:17:01 +0100 Subject: 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 --- src/gestures-pinch.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/gestures-pinch.c') 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); } -- cgit v1.2.3