QWaylandInputDevice: Reset cursor surface state when using shape cursor

CursorSurface::update only calls set_cursor if the hotspot or serial has
changed. Reset its state when using a shape cursor to ensure switching
back to a cursor surface (e.g. when switching from a shape to a bitmap
cursor) works as expected.

Change-Id: Ia04dff468c251030a75e9f1eac642ed764879125
Reviewed-by: David Edmundson <davidedmundson@kde.org>
(cherry picked from commit 30216b545f3ef0a9bf465e57ba04b054d2a96728)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

1 files changed, 10 insertions, 1 deletions

diff --git a/src/client/qwaylandinputdevice.cpp b/src/client/qwaylandinputdevice.cpp
index a5d3eb8f2..2a5cf9003 100644
--- a/src/client/qwaylandinputdevice.cpp
+++ b/src/client/qwaylandinputdevice.cpp
@@ -185,12 +185,18 @@ public:
                 m_pointer, &QWaylandInputDevice::Pointer::updateCursor);
     }
 
+    void reset()
+    {
+        m_setSerial = 0;
+        m_hotspot = QPoint();
+    }
+
     void hide()
     {
         uint serial = m_pointer->mEnterSerial;
         Q_ASSERT(serial);
         m_pointer->set_cursor(serial, nullptr, 0, 0);
-        m_setSerial = 0;
+        reset();
     }
 
     // Size and hotspot are in surface coordinates
@@ -308,6 +314,9 @@ void QWaylandInputDevice::Pointer::updateCursor()
     }
 
     if (mCursor.shape) {
+        if (mCursor.surface) {
+            mCursor.surface->reset();
+        }
         mCursor.shape->setShape(mEnterSerial, shape);
         return;
     }