diff options
author | Giulio Camuffo <giulio.camuffo@kdab.com> | 2017-02-04 11:33:56 +0100 |
---|---|---|
committer | Giulio Camuffo <giulio.camuffo@kdab.com> | 2017-05-12 15:53:34 +0000 |
commit | 6e199d1018cb569e1ffaa6ad4d3203333280650d (patch) | |
tree | 871a234938f00538a62d0f41921be89e4ab1d8af | |
parent | e07d221b3029ad88fab82bcbf25e492cea626d7d (diff) | |
download | qtwayland-6e199d1018cb569e1ffaa6ad4d3203333280650d.tar.gz |
Set the cursor when the pointer enters the window
Change-Id: I1ff9928bc5d9d1d80ce07561243eeec89c406e36
Reviewed-by: Jan Arne Petersen <jan.petersen@kdab.com>
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
-rw-r--r-- | src/client/qwaylandinputdevice.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/client/qwaylandinputdevice.cpp b/src/client/qwaylandinputdevice.cpp index 59dcb1d7..4def0de8 100644 --- a/src/client/qwaylandinputdevice.cpp +++ b/src/client/qwaylandinputdevice.cpp @@ -377,7 +377,7 @@ void QWaylandInputDevice::setCursor(Qt::CursorShape newShape, QWaylandScreen *sc void QWaylandInputDevice::setCursor(const QCursor &cursor, QWaylandScreen *screen) { - if (cursor.shape() != Qt::BitmapCursor && cursor.shape() == mPointer->mCursorShape) + if (mPointer->mCursorSerial >= mPointer->mEnterSerial && (cursor.shape() != Qt::BitmapCursor && cursor.shape() == mPointer->mCursorShape)) return; mPointer->mCursorShape = cursor.shape(); |