diff options
author | Peter Hutterer <peter.hutterer@who-t.net> | 2016-01-25 15:29:11 +1000 |
---|---|---|
committer | Peter Hutterer <peter.hutterer@who-t.net> | 2016-01-25 15:29:11 +1000 |
commit | de3f1fa6fa23cebef17640dc1eb4ea8df270ecd9 (patch) | |
tree | 0eb7ae087e9dd10fc2b962a8879d6906773a674a /src/libinput.c | |
parent | 6920a42fd4ec8dfa633ef5bc1865f994afc63693 (diff) | |
parent | b6f59d0e3b2e38abd0c79e36a5971dc7ea1e2b16 (diff) |
Merge branch 'master' into tablet-supporttablet-support
Diffstat (limited to 'src/libinput.c')
-rw-r--r-- | src/libinput.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/libinput.c b/src/libinput.c index a0dc6d68..aaeff9a3 100644 --- a/src/libinput.c +++ b/src/libinput.c @@ -2402,25 +2402,27 @@ void gesture_notify_pinch(struct libinput_device *device, uint64_t time, enum libinput_event_type type, + int finger_count, const struct normalized_coords *delta, const struct normalized_coords *unaccel, double scale, double angle) { - gesture_notify(device, time, type, 2, 0, delta, unaccel, - scale, angle); + gesture_notify(device, time, type, finger_count, 0, + delta, unaccel, scale, angle); } void gesture_notify_pinch_end(struct libinput_device *device, uint64_t time, + int finger_count, double scale, int cancelled) { const struct normalized_coords zero = { 0.0, 0.0 }; gesture_notify(device, time, LIBINPUT_EVENT_GESTURE_PINCH_END, - 2, cancelled, &zero, &zero, scale, 0.0); + finger_count, cancelled, &zero, &zero, scale, 0.0); } static inline const char * |