From 803f160dc3af942da6b3d5917ea52e1392f0ed93 Mon Sep 17 00:00:00 2001 From: Nicolas Fella Date: Mon, 10 Jun 2024 15:40:31 +0200 Subject: [PATCH] Client: Pass modifiers to tablet event handling So that the resulting QTabletEvent has the modifier information Pick-to: 6.8 6.7 6.5 Change-Id: Ifbd771f59ac41b740ccb65db2986726e7a32a760 Reviewed-by: Shawn Rutledge --- src/plugins/platforms/wayland/qwaylandtabletv2.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/plugins/platforms/wayland/qwaylandtabletv2.cpp b/src/plugins/platforms/wayland/qwaylandtabletv2.cpp index aa942161431..be8f1977008 100644 --- a/src/plugins/platforms/wayland/qwaylandtabletv2.cpp +++ b/src/plugins/platforms/wayland/qwaylandtabletv2.cpp @@ -272,9 +272,11 @@ void QWaylandTabletToolV2::zwp_tablet_tool_v2_frame(uint32_t time) qreal tangentialPressure = m_pending.slider; qreal rotation = m_pending.rotation; int z = int(m_pending.distance); - QWindowSystemInterface::handleTabletEvent(window, timestamp, localPosition, globalPosition, - int(m_tabletDevice), int(m_pointerType), buttons, pressure, - xTilt, yTilt, tangentialPressure, rotation, z, m_uid); + + QWindowSystemInterface::handleTabletEvent( + window, timestamp, localPosition, globalPosition, int(m_tabletDevice), + int(m_pointerType), buttons, pressure, xTilt, yTilt, tangentialPressure, rotation, + z, m_uid, m_tabletSeat->seat()->modifiers()); } if (!m_pending.proximitySurface && m_applied.enteredSurface) {