diff options
| author | Brian Ashworth <RedSoxFan@users.noreply.github.com> | 2018-05-12 12:43:34 -0400 | 
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-12 12:43:34 -0400 | 
| commit | ec60e24f75f778b378206366057df4efae4b8630 (patch) | |
| tree | a2b6ce2f6f28b294ae6cbb8cbf49b107138215f5 /sway/input | |
| parent | e3625d8f337d61c5d2ba1266679b9053168cd0ae (diff) | |
| parent | b1c33ecc256c58c7ecee28e2f4507dd374727d62 (diff) | |
| download | sway-ec60e24f75f778b378206366057df4efae4b8630.tar.xz | |
Merge branch 'master' into edge-borders
Diffstat (limited to 'sway/input')
| -rw-r--r-- | sway/input/cursor.c | 2 | 
1 files changed, 1 insertions, 1 deletions
| diff --git a/sway/input/cursor.c b/sway/input/cursor.c index c0c6e827..51ce86e1 100644 --- a/sway/input/cursor.c +++ b/sway/input/cursor.c @@ -240,7 +240,7 @@ static void handle_cursor_axis(struct wl_listener *listener, void *data) {  	struct sway_cursor *cursor = wl_container_of(listener, cursor, axis);  	struct wlr_event_pointer_axis *event = data;  	wlr_seat_pointer_notify_axis(cursor->seat->wlr_seat, event->time_msec, -		event->orientation, event->delta); +		event->orientation, event->delta, event->delta_discrete, event->source);  }  static void handle_touch_down(struct wl_listener *listener, void *data) { | 
