From 2136cedfff03fa701afc05439a7e65b0c65ca69c Mon Sep 17 00:00:00 2001 From: Kai Uwe Broulik Date: Thu, 14 Dec 2023 12:49:17 +0100 Subject: [PATCH] QWaylandCursor: Set appropriate shape for drag cursors Even if the compositor is free to do whatever during a drag, the client can still set a proper cursor. The codepath without cursor-shape also doesn't special case them. Pick-to: 6.7 6.6 Change-Id: Ib6b9864d8024ff2919471d6f2d12f9ba8e2e512d Reviewed-by: David Edmundson Reviewed-by: Vlad Zahorodnii --- src/plugins/platforms/wayland/qwaylandcursor.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/platforms/wayland/qwaylandcursor.cpp b/src/plugins/platforms/wayland/qwaylandcursor.cpp index 09e2e101078..e7464ed8f9a 100644 --- a/src/plugins/platforms/wayland/qwaylandcursor.cpp +++ b/src/plugins/platforms/wayland/qwaylandcursor.cpp @@ -267,11 +267,11 @@ static QtWayland::wp_cursor_shape_device_v1::shape qtCursorShapeToWaylandShape(Q case Qt::ClosedHandCursor: return wp_cursor_shape_device_v1::shape_grabbing; case Qt::DragMoveCursor: + return wp_cursor_shape_device_v1::shape_move; case Qt::DragCopyCursor: + return wp_cursor_shape_device_v1::shape_copy; case Qt::DragLinkCursor: - // drags on wayland are different, the compositor knows - // the drag type and can do something custom - return wp_cursor_shape_device_v1::shape_grab; + return wp_cursor_shape_device_v1::shape_alias; } return wp_cursor_shape_device_v1::shape_default; }