cursor: Prevent setting cursor icon on drag

Partly fixes #549
This commit is contained in:
Consolatis 2022-09-21 07:42:34 +02:00 committed by Johan Malm
parent 76d8982d3e
commit 2c83a5fcb8

View file

@ -395,12 +395,15 @@ cursor_update_common(struct server *server, struct cursor_context *ctx,
/* /*
* Cursor is over a server (labwc) surface. Clear focus * Cursor is over a server (labwc) surface. Clear focus
* from the focused client (if any, no-op otherwise) and * from the focused client (if any, no-op otherwise) and
* set the cursor image ourselves. * set the cursor image ourselves when not currently in
* a drag operation.
*/ */
wlr_seat_pointer_notify_clear_focus(wlr_seat); wlr_seat_pointer_notify_clear_focus(wlr_seat);
if (!seat->drag_icon) {
cursor_set(seat, cursor_get_from_ssd(ctx->type)); cursor_set(seat, cursor_get_from_ssd(ctx->type));
} }
} }
}
uint32_t uint32_t
cursor_get_resize_edges(struct wlr_cursor *cursor, struct cursor_context *ctx) cursor_get_resize_edges(struct wlr_cursor *cursor, struct cursor_context *ctx)