2 files changed, 7 insertions, 3 deletions

diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index 44b5ff14..b96fde88 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -613,6 +613,7 @@ void dispatch_cursor_button(struct sway_cursor *cursor,
                 } else {
                         state_erase_button(cursor, button);
                 }
+                seat_pointer_notify_button(seat, time_msec, button, state);
                 return;
         }
 
@@ -681,6 +682,7 @@ void dispatch_cursor_button(struct sway_cursor *cursor,
         if (cont && resize_edge && button == BTN_LEFT &&
                         state == WLR_BUTTON_PRESSED && !is_floating) {
                 seat_set_focus_container(seat, cont);
+                seat_pointer_notify_button(seat, time_msec, button, state);
                 seatop_begin_resize_tiling(seat, cont, button, edge);
                 return;
         }
@@ -711,6 +713,7 @@ void dispatch_cursor_button(struct sway_cursor *cursor,
                         }
                         cursor_set_image(seat->cursor, image, NULL);
                         seat_set_focus_container(seat, cont);
+                        seat_pointer_notify_button(seat, time_msec, button, state);
                         seatop_begin_resize_tiling(seat, cont, button, edge);
                         return;
                 }
@@ -726,6 +729,7 @@ void dispatch_cursor_button(struct sway_cursor *cursor,
                                 cont = cont->parent;
                         }
                         seat_set_focus_container(seat, cont);
+                        seat_pointer_notify_button(seat, time_msec, button, state);
                         seatop_begin_move_floating(seat, cont, button);
                         return;
                 }
@@ -736,6 +740,7 @@ void dispatch_cursor_button(struct sway_cursor *cursor,
                         state == WLR_BUTTON_PRESSED) {
                 // Via border
                 if (button == BTN_LEFT && resize_edge != WLR_EDGE_NONE) {
+                        seat_pointer_notify_button(seat, time_msec, button, state);
                         seatop_begin_resize_floating(seat, cont, button, resize_edge);
                         return;
                 }
@@ -753,6 +758,7 @@ void dispatch_cursor_button(struct sway_cursor *cursor,
                                 WLR_EDGE_RIGHT : WLR_EDGE_LEFT;
                         edge |= cursor->cursor->y > floater->y + floater->height / 2 ?
                                 WLR_EDGE_BOTTOM : WLR_EDGE_TOP;
+                        seat_pointer_notify_button(seat, time_msec, button, state);
                         seatop_begin_resize_floating(seat, floater, button, edge);
                         return;
                 }
@@ -784,6 +790,7 @@ void dispatch_cursor_button(struct sway_cursor *cursor,
         if (surface && cont && state == WLR_BUTTON_PRESSED) {
                 seat_set_focus_container(seat, cont);
                 seatop_begin_down(seat, cont, time_msec, button, sx, sy);
+                seat_pointer_notify_button(seat, time_msec, button, WLR_BUTTON_PRESSED);
                 return;
         }
 
diff --git a/sway/input/seatop_down.c b/sway/input/seatop_down.c
index 33f9b31a..7f394095 100644
--- a/sway/input/seatop_down.c
+++ b/sway/input/seatop_down.c
@@ -40,8 +40,6 @@ static void handle_finish(struct sway_seat *seat, uint32_t time_msec) {
                                 cursor->cursor->x, cursor->cursor->y, &surface, &sx, &sy);
                 cursor_send_pointer_motion(cursor, 0, node, surface, sx, sy);
         }
-        seat_pointer_notify_button(seat, time_msec,
-                seat->seatop_button, WLR_BUTTON_RELEASED);
 }
 
 static void handle_abort(struct sway_seat *seat) {
@@ -82,6 +80,5 @@ void seatop_begin_down(struct sway_seat *seat, struct sway_container *con,
         seat->seatop_data = e;
         seat->seatop_button = button;
 
-        seat_pointer_notify_button(seat, time_msec, button, WLR_BUTTON_PRESSED);
         container_raise_floating(con);
 }