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

Send mouse events with the correct modifiers

Browse Source 
Change-Id: I33da2681bc2315b3dc7de16fa80c45e26a478caa
Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
This commit is contained in:
Giulio Camuffo 2015-01-29 21:10:25 +02:00
parent 5d36ed33c7
commit f58cc97806
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -419,7 +419,7 @@ void QWaylandInputDevice::Pointer::pointer_enter(uint32_t serial, struct wl_surf
QWaylandWindow *grab = QWaylandWindow::mouseGrab(); QWaylandWindow *grab = QWaylandWindow::mouseGrab();
if (!grab) { if (!grab) {
window->handleMouseEnter(mParent); window->handleMouseEnter(mParent);
window->handleMouse(mParent, mParent->mTime, mSurfacePos, mGlobalPos, mButtons, Qt::NoModifier); window->handleMouse(mParent, mParent->mTime, mSurfacePos, mGlobalPos, mButtons, mParent->modifiers());
} }
} }
@ -468,9 +468,9 @@ void QWaylandInputDevice::Pointer::pointer_motion(uint32_t time, wl_fixed_t surf
// so we just set it outside of the window boundaries. // so we just set it outside of the window boundaries.
pos = QPointF(-1, -1); pos = QPointF(-1, -1);
global = grab->window()->mapToGlobal(pos.toPoint()); global = grab->window()->mapToGlobal(pos.toPoint());
grab->handleMouse(mParent, time, pos, global, mButtons, Qt::NoModifier); grab->handleMouse(mParent, time, pos, global, mButtons, mParent->modifiers());
} else } else
window->handleMouse(mParent, time, mSurfacePos, mGlobalPos, mButtons, Qt::NoModifier); window->handleMouse(mParent, time, mSurfacePos, mGlobalPos, mButtons, mParent->modifiers());
} }
void QWaylandInputDevice::Pointer::pointer_button(uint32_t serial, uint32_t time, void QWaylandInputDevice::Pointer::pointer_button(uint32_t serial, uint32_t time,
@ -514,9 +514,9 @@ void QWaylandInputDevice::Pointer::pointer_button(uint32_t serial, uint32_t time
if (grab && grab != mFocus) { if (grab && grab != mFocus) {
QPointF pos = QPointF(-1, -1); QPointF pos = QPointF(-1, -1);
QPointF global = grab->window()->mapToGlobal(pos.toPoint()); QPointF global = grab->window()->mapToGlobal(pos.toPoint());
grab->handleMouse(mParent, time, pos, global, mButtons, Qt::NoModifier); grab->handleMouse(mParent, time, pos, global, mButtons, mParent->modifiers());
} else if (window) } else if (window)
window->handleMouse(mParent, time, mSurfacePos, mGlobalPos, mButtons, Qt::NoModifier); window->handleMouse(mParent, time, mSurfacePos, mGlobalPos, mButtons, mParent->modifiers());
} }
void QWaylandInputDevice::Pointer::pointer_axis(uint32_t time, uint32_t axis, int32_t value) void QWaylandInputDevice::Pointer::pointer_axis(uint32_t time, uint32_t axis, int32_t value)