summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.p.agocs@nokia.com>2012-01-25 19:36:19 +0100
committerLaszlo Agocs <laszlo.p.agocs@nokia.com>2012-01-26 09:23:34 +0100
commitbd0681daf6fa91afee16bba619f17b7bd3bd5460 (patch)
tree2ecdfc533d96def97a982056060653b2f807f846 /src
parent2444614cfa4009846921157ddfe2fbb9be76e515 (diff)
Do not generate mouse event on the first motion event.
This event comes before the button event and thus must not result in a Qt mouse event. Instead, the button event will generate the MouseButtonPressed with the position sent in this motion. Change-Id: I97887d4d5fcd54575d6f4e9523a04569424c0bc2 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/platforms/wayland/qwaylandinputdevice.cpp13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/plugins/platforms/wayland/qwaylandinputdevice.cpp b/src/plugins/platforms/wayland/qwaylandinputdevice.cpp
index 7d1a6470b..4a9a5271e 100644
--- a/src/plugins/platforms/wayland/qwaylandinputdevice.cpp
+++ b/src/plugins/platforms/wayland/qwaylandinputdevice.cpp
@@ -136,11 +136,14 @@ void QWaylandInputDevice::inputHandleMotion(void *data,
inputDevice->mSurfacePos = QPoint(surface_x, surface_y);
inputDevice->mGlobalPos = QPoint(x, y);
inputDevice->mTime = time;
- QWindowSystemInterface::handleMouseEvent(window->window(),
- time,
- inputDevice->mSurfacePos,
- inputDevice->mGlobalPos,
- inputDevice->mButtons);
+
+ if (inputDevice->mButtons) {
+ QWindowSystemInterface::handleMouseEvent(window->window(),
+ time,
+ inputDevice->mSurfacePos,
+ inputDevice->mGlobalPos,
+ inputDevice->mButtons);
+ }
}
void QWaylandInputDevice::inputHandleButton(void *data,