From 01b0c11394b88fea2ec8ac691e30504f1e0800f5 Mon Sep 17 00:00:00 2001 From: hrdl <31923882+hrdl-github@users.noreply.github.com> Date: Thu, 11 May 2023 11:16:51 +0200 Subject: seatop_down: Call seatop_begin_default after sending touch events This is consistent with pointer tablet and button events. Fixes #7577. --- sway/input/seatop_down.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sway/input/seatop_down.c b/sway/input/seatop_down.c index 81e8d0a7..36f9bb60 100644 --- a/sway/input/seatop_down.c +++ b/sway/input/seatop_down.c @@ -64,11 +64,11 @@ static void handle_touch_up(struct sway_seat *seat, } } + wlr_seat_touch_notify_up(seat->wlr_seat, event->time_msec, event->touch_id); + if (wl_list_empty(&e->point_events)) { seatop_begin_default(seat); } - - wlr_seat_touch_notify_up(seat->wlr_seat, event->time_msec, event->touch_id); } static void handle_touch_down(struct sway_seat *seat, @@ -117,13 +117,13 @@ static void handle_touch_cancel(struct sway_seat *seat, } } - if (wl_list_empty(&e->point_events)) { - seatop_begin_default(seat); - } - if (e->surface) { wlr_seat_touch_notify_cancel(seat->wlr_seat, e->surface); } + + if (wl_list_empty(&e->point_events)) { + seatop_begin_default(seat); + } } static void handle_pointer_axis(struct sway_seat *seat, -- cgit v1.2.3-54-g00ecf