summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Uwe Broulik <kde@privat.broulik.de>2023-12-14 12:49:17 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2023-12-14 17:40:13 +0000
commitfa9dec205b29b169dfd6a2897ad3b7d3b26142be (patch)
tree5101dfad5bd8a5941350cb8ca2c590ff1994ce58
parentb0f96ca63ee89f06254d65a8aca780c0d61933b4 (diff)
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.6 Change-Id: Ib6b9864d8024ff2919471d6f2d12f9ba8e2e512d Reviewed-by: David Edmundson <davidedmundson@kde.org> Reviewed-by: Vlad Zahorodnii <vlad.zahorodnii@kde.org> (cherry picked from commit c9ade893aeacbe244300217aad51eee2a84940f7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/client/qwaylandcursor.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/client/qwaylandcursor.cpp b/src/client/qwaylandcursor.cpp
index 09e2e1010..e7464ed8f 100644
--- a/src/client/qwaylandcursor.cpp
+++ b/src/client/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;
}