summaryrefslogtreecommitdiff
path: root/src/gestures-pinch.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/gestures-pinch.c')
-rw-r--r--src/gestures-pinch.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gestures-pinch.c b/src/gestures-pinch.c
index 45f1cb3..fa8a626 100644
--- a/src/gestures-pinch.c
+++ b/src/gestures-pinch.c
@@ -38,7 +38,7 @@ static const int fm_mask = 0x04;
38static void set_props(const struct gesture_inserter *gin, 38static void set_props(const struct gesture_inserter *gin,
39 struct combo_model *s, 39 struct combo_model *s,
40 const struct move_model *m, 40 const struct move_model *m,
41 const struct touch_frame *frame) 41 const struct utouch_frame *frame)
42{ 42{
43 s->prop[GRAIL_PROP_PINCH_DR] = gin->scale_r * m->fm[FM_R].action_delta; 43 s->prop[GRAIL_PROP_PINCH_DR] = gin->scale_r * m->fm[FM_R].action_delta;
44 s->prop[GRAIL_PROP_PINCH_VR] = gin->scale_r * m->fm[FM_R].velocity; 44 s->prop[GRAIL_PROP_PINCH_VR] = gin->scale_r * m->fm[FM_R].velocity;
@@ -48,7 +48,7 @@ static void set_props(const struct gesture_inserter *gin,
48} 48}
49 49
50int gru_pinch(struct grail *ge, 50int gru_pinch(struct grail *ge,
51 const struct touch_frame *frame) 51 const struct utouch_frame *frame)
52{ 52{
53 struct gesture_recognizer *gru = ge->gru; 53 struct gesture_recognizer *gru = ge->gru;
54 struct combo_model *state = &gru->pinch; 54 struct combo_model *state = &gru->pinch;
@@ -79,7 +79,7 @@ int gru_pinch(struct grail *ge,
79} 79}
80 80
81int gru_winpinch(struct grail *ge, 81int gru_winpinch(struct grail *ge,
82 const struct touch_frame *frame) 82 const struct utouch_frame *frame)
83{ 83{
84 struct gesture_recognizer *gru = ge->gru; 84 struct gesture_recognizer *gru = ge->gru;
85 struct combo_model *state = &gru->winpinch; 85 struct combo_model *state = &gru->winpinch;