Make axis events compatible with Weston

From now on mouse wheel events will work both with qt-compositor and
Weston.

Change-Id: I54876cd45f3530ea9b4b7962ca52c0974e1cb2d5
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>

diff --git a/src/compositor/wayland_wrapper/wlinputdevice.cpp b/src/compositor/wayland_wrapper/wlinputdevice.cpp
index 10be24b..a38057c 100644 (file)
--- a/src/compositor/wayland_wrapper/wlinputdevice.cpp
+++ b/src/compositor/wayland_wrapper/wlinputdevice.cpp
@@ -263,7 +263,7 @@ void InputDevice::sendMouseWheelEvent(Qt::Orientation orientation, int delta)
     uint32_t time = m_compositor->currentTimeMsecs();
     uint32_t axis = orientation == Qt::Horizontal ? WL_POINTER_AXIS_HORIZONTAL_SCROLL
                                                   : WL_POINTER_AXIS_VERTICAL_SCROLL;
-    wl_pointer_send_axis(resource, time, axis, delta);
+    wl_pointer_send_axis(resource, time, axis, delta / 120);
 }
 
 void InputDevice::sendKeyPressEvent(uint code)

diff --git a/src/plugins/platforms/wayland/qwaylandinputdevice.cpp b/src/plugins/platforms/wayland/qwaylandinputdevice.cpp
index cbb922b..f835eb2 100644 (file)
--- a/src/plugins/platforms/wayland/qwaylandinputdevice.cpp
+++ b/src/plugins/platforms/wayland/qwaylandinputdevice.cpp
@@ -338,10 +338,12 @@ void QWaylandInputDevice::pointer_axis(void *data,
     QWaylandWindow *window = inputDevice->mPointerFocus;
     Qt::Orientation orientation = axis == WL_POINTER_AXIS_HORIZONTAL_SCROLL ? Qt::Horizontal
                                                                             : Qt::Vertical;
-    QWindowSystemInterface::handleWheelEvent(window->window(), time,
+    QWindowSystemInterface::handleWheelEvent(window->window(),
+                                             time,
                                              inputDevice->mSurfacePos,
                                              inputDevice->mGlobalPos,
-                                             value, orientation);
+                                             value * 120,
+                                             orientation);
 }
 
 #ifndef QT_NO_WAYLAND_XKB