1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/5.12' into dev

Browse Source 
Change-Id: I224c25d20f58723d085e4ee340744d1c7af67933
This commit is contained in:
Qt Forward Merge Bot 2018-11-24 03:00:23 +01:00
commit 84a3f82b28
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/platforms/wayland/qwaylandinputdevice.cpp
View File

@ -453,10 +453,6 @@ void QWaylandInputDevice::Pointer::pointer_enter(uint32_t serial, struct wl_surf
return; return;
QWaylandWindow *window = QWaylandWindow::fromWlSurface(surface); QWaylandWindow *window = QWaylandWindow::fromWlSurface(surface);
#if QT_CONFIG(cursor)
window->window()->setCursor(window->window()->cursor());
#endif
mFocus = window; mFocus = window;
mSurfacePos = QPointF(wl_fixed_to_double(sx), wl_fixed_to_double(sy)); mSurfacePos = QPointF(wl_fixed_to_double(sx), wl_fixed_to_double(sy));
mGlobalPos = window->window()->mapToGlobal(mSurfacePos.toPoint()); mGlobalPos = window->window()->mapToGlobal(mSurfacePos.toPoint());
@ -464,6 +460,11 @@ void QWaylandInputDevice::Pointer::pointer_enter(uint32_t serial, struct wl_surf
mParent->mSerial = serial; mParent->mSerial = serial;
mEnterSerial = serial; mEnterSerial = serial;
#if QT_CONFIG(cursor)
// Depends on mEnterSerial being updated
window->window()->setCursor(window->window()->cursor());
#endif
QWaylandWindow *grab = QWaylandWindow::mouseGrab(); QWaylandWindow *grab = QWaylandWindow::mouseGrab();
if (!grab) { if (!grab) {
EnterEvent evt(mSurfacePos, mGlobalPos); EnterEvent evt(mSurfacePos, mGlobalPos);