diff options
| author | David Edmundson <[email protected]> | 2025-08-13 14:53:43 +0100 |
|---|---|---|
| committer | David Edmundson <[email protected]> | 2025-08-13 15:00:40 +0100 |
| commit | d673c349d040ad515745ac68c15352a8f5d485e2 (patch) | |
| tree | f233019ef5a94d5b4e58ed8fff4e429e7a0ae76e | |
| parent | 70a9f6462761e55dde16bbd0423556a8de923a34 (diff) | |
The decoration should not be setting the cursor in the same way as
application code setting the cursor which gets stored for future usage.
Pick-to: 6.10
Change-Id: I60bc078a3b9033ea37cf81c5cd5d485838ac4b68
Reviewed-by: David Redondo <[email protected]>
| -rw-r--r-- | src/plugins/decorations/adwaita/qwaylandadwaitadecoration.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/plugins/decorations/adwaita/qwaylandadwaitadecoration.cpp b/src/plugins/decorations/adwaita/qwaylandadwaitadecoration.cpp index 01424b5db..1c0ca9477 100644 --- a/src/plugins/decorations/adwaita/qwaylandadwaitadecoration.cpp +++ b/src/plugins/decorations/adwaita/qwaylandadwaitadecoration.cpp @@ -613,19 +613,19 @@ void QWaylandAdwaitaDecoration::processMouseTop(QWaylandInputDevice *inputDevice if (local.x() <= margins().left()) { // top left bit #if QT_CONFIG(cursor) - waylandWindow()->setMouseCursor(inputDevice, Qt::SizeFDiagCursor); + waylandWindow()->applyCursor(inputDevice, Qt::SizeFDiagCursor); #endif startResize(inputDevice, Qt::TopEdge | Qt::LeftEdge, b); } else if (local.x() > surfaceRect.right() - margins().left()) { // top right bit #if QT_CONFIG(cursor) - waylandWindow()->setMouseCursor(inputDevice, Qt::SizeBDiagCursor); + waylandWindow()->applyCursor(inputDevice, Qt::SizeBDiagCursor); #endif startResize(inputDevice, Qt::TopEdge | Qt::RightEdge, b); } else { // top resize bit #if QT_CONFIG(cursor) - waylandWindow()->setMouseCursor(inputDevice, Qt::SizeVerCursor); + waylandWindow()->applyCursor(inputDevice, Qt::SizeVerCursor); #endif startResize(inputDevice, Qt::TopEdge, b); } @@ -671,19 +671,19 @@ void QWaylandAdwaitaDecoration::processMouseBottom(QWaylandInputDevice *inputDev if (local.x() <= margins().left()) { // bottom left bit #if QT_CONFIG(cursor) - waylandWindow()->setMouseCursor(inputDevice, Qt::SizeBDiagCursor); + waylandWindow()->applyCursor(inputDevice, Qt::SizeBDiagCursor); #endif startResize(inputDevice, Qt::BottomEdge | Qt::LeftEdge, b); } else if (local.x() > window()->width() + margins().right()) { // bottom right bit #if QT_CONFIG(cursor) - waylandWindow()->setMouseCursor(inputDevice, Qt::SizeFDiagCursor); + waylandWindow()->applyCursor(inputDevice, Qt::SizeFDiagCursor); #endif startResize(inputDevice, Qt::BottomEdge | Qt::RightEdge, b); } else { // bottom bit #if QT_CONFIG(cursor) - waylandWindow()->setMouseCursor(inputDevice, Qt::SizeVerCursor); + waylandWindow()->applyCursor(inputDevice, Qt::SizeVerCursor); #endif startResize(inputDevice, Qt::BottomEdge, b); } @@ -695,7 +695,7 @@ void QWaylandAdwaitaDecoration::processMouseLeft(QWaylandInputDevice *inputDevic Q_UNUSED(local) Q_UNUSED(mods) #if QT_CONFIG(cursor) - waylandWindow()->setMouseCursor(inputDevice, Qt::SizeHorCursor); + waylandWindow()->applyCursor(inputDevice, Qt::SizeHorCursor); #endif startResize(inputDevice, Qt::LeftEdge, b); } @@ -706,7 +706,7 @@ void QWaylandAdwaitaDecoration::processMouseRight(QWaylandInputDevice *inputDevi Q_UNUSED(local) Q_UNUSED(mods) #if QT_CONFIG(cursor) - waylandWindow()->setMouseCursor(inputDevice, Qt::SizeHorCursor); + waylandWindow()->applyCursor(inputDevice, Qt::SizeHorCursor); #endif startResize(inputDevice, Qt::RightEdge, b); } |