From 2c83a5fcb88e2d860ce9312fb46cefd94e4b57aa Mon Sep 17 00:00:00 2001
From: Consolatis <35009135+Consolatis@users.noreply.github.com>
Date: Wed, 21 Sep 2022 07:42:34 +0200
Subject: [PATCH] cursor: Prevent setting cursor icon on drag

Partly fixes #549
---
 src/cursor.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/cursor.c b/src/cursor.c
index 7eac1e9b..077c2853 100644
--- 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));
+		}
 	}
 }