From cf44bcd9ff11e77a0979ded91848bf0f9f2d5832 Mon Sep 17 00:00:00 2001 From: Tang Haixiang Date: Thu, 13 Jan 2022 15:09:46 +0800 Subject: wayland touch event to add key modifier Add touch event keyboard modifier for wayland, which is done in qpa xcb, which is very convenient on tablets with keyboards. Change-Id: I4e6ed369f3444da41d06f9a9a83addf7de0a4e91 Reviewed-by: Povilas Kanapickas Reviewed-by: David Edmundson (cherry picked from commit a2dd5efbaa4b63782261664ca9a1aa9973db976e) Reviewed-by: Liang Qi --- src/client/qwaylandinputdevice.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/qwaylandinputdevice.cpp b/src/client/qwaylandinputdevice.cpp index 9490a66d..7fad67ca 100644 --- a/src/client/qwaylandinputdevice.cpp +++ b/src/client/qwaylandinputdevice.cpp @@ -1483,7 +1483,7 @@ void QWaylandInputDevice::Touch::touch_frame() return; } - QWindowSystemInterface::handleTouchEvent(window, mParent->mTouchDevice, mPendingTouchPoints); + QWindowSystemInterface::handleTouchEvent(window, mParent->mTouchDevice, mPendingTouchPoints, mParent->modifiers()); // Prepare state for next frame const auto prevTouchPoints = mPendingTouchPoints; -- cgit v1.2.1