cursor: Prevent setting cursor icon on drag

Partly fixes #549

diff --git a/src/cursor.c b/src/cursor.c
index 7eac1e9b161e0d0739acbc91833f05ce9fdc771b..077c285334358011673dbf7bf944e52382927f80 100644 (file)
--- a/src/cursor.c
+++ b/src/cursor.c
@@ -395,10 +395,13 @@ cursor_update_common(struct server *server, struct cursor_context *ctx,
                /*
                 * Cursor is over a server (labwc) surface.  Clear focus
                 * 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);
-               cursor_set(seat, cursor_get_from_ssd(ctx->type));
+               if (!seat->drag_icon) {
+                       cursor_set(seat, cursor_get_from_ssd(ctx->type));
+               }
        }
 }