diff options
author | Kirill Primak <vyivel@eclair.cafe> | 2024-01-22 21:24:41 +0300 |
---|---|---|
committer | Simon Ser <contact@emersion.fr> | 2024-01-23 10:45:58 +0100 |
commit | a4e85332a1fe6b079c6da1689ca33d8ba4c71977 (patch) | |
tree | 23568108f2444773d2043b15d7d9ee5a5b82dd8f | |
parent | layer_shell: Fix typo of return instead of continue (diff) | |
download | sway-a4e85332a1fe6b079c6da1689ca33d8ba4c71977.tar.gz sway-a4e85332a1fe6b079c6da1689ca33d8ba4c71977.tar.zst sway-a4e85332a1fe6b079c6da1689ca33d8ba4c71977.zip |
Chase wlroots!4003
-rw-r--r-- | sway/input/seatop_default.c | 5 | ||||
-rw-r--r-- | sway/input/seatop_down.c | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/sway/input/seatop_default.c b/sway/input/seatop_default.c index 0f4d0385..c56330fd 100644 --- a/sway/input/seatop_default.c +++ b/sway/input/seatop_default.c | |||
@@ -796,8 +796,9 @@ static void handle_pointer_axis(struct sway_seat *seat, | |||
796 | 796 | ||
797 | if (!handled) { | 797 | if (!handled) { |
798 | wlr_seat_pointer_notify_axis(cursor->seat->wlr_seat, event->time_msec, | 798 | wlr_seat_pointer_notify_axis(cursor->seat->wlr_seat, event->time_msec, |
799 | event->orientation, scroll_factor * event->delta, | 799 | event->orientation, scroll_factor * event->delta, |
800 | roundf(scroll_factor * event->delta_discrete), event->source); | 800 | roundf(scroll_factor * event->delta_discrete), event->source, |
801 | event->relative_direction); | ||
801 | } | 802 | } |
802 | } | 803 | } |
803 | 804 | ||
diff --git a/sway/input/seatop_down.c b/sway/input/seatop_down.c index 36f9bb60..b4421fe6 100644 --- a/sway/input/seatop_down.c +++ b/sway/input/seatop_down.c | |||
@@ -137,7 +137,8 @@ static void handle_pointer_axis(struct sway_seat *seat, | |||
137 | 137 | ||
138 | wlr_seat_pointer_notify_axis(seat->wlr_seat, event->time_msec, | 138 | wlr_seat_pointer_notify_axis(seat->wlr_seat, event->time_msec, |
139 | event->orientation, scroll_factor * event->delta, | 139 | event->orientation, scroll_factor * event->delta, |
140 | roundf(scroll_factor * event->delta_discrete), event->source); | 140 | roundf(scroll_factor * event->delta_discrete), event->source, |
141 | event->relative_direction); | ||
141 | } | 142 | } |
142 | 143 | ||
143 | static void handle_button(struct sway_seat *seat, uint32_t time_msec, | 144 | static void handle_button(struct sway_seat *seat, uint32_t time_msec, |