From aee64bbe134b057b60e8848a8433cd9c4329b046 Mon Sep 17 00:00:00 2001 From: Aleksandr Reviakin Date: Fri, 16 Sep 2022 13:18:41 +0200 Subject: wasm: capture pointer unconditionally on PointerDown event MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The pointer events weren't captured previously if, for example, mouse was pressed inside the window and released outside of the window. Pick-to: 6.4 Fixes: QTBUG-71948 Change-Id: Ie50e5c132fa03046f0c5b321c35a58cb9f34b67a Reviewed-by: Mikołaj Boc Reviewed-by: Morten Johan Sørvig --- src/plugins/platforms/wasm/qwasmcompositor.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/platforms/wasm/qwasmcompositor.cpp b/src/plugins/platforms/wasm/qwasmcompositor.cpp index a892f7077b..8ba67040a5 100644 --- a/src/plugins/platforms/wasm/qwasmcompositor.cpp +++ b/src/plugins/platforms/wasm/qwasmcompositor.cpp @@ -606,6 +606,8 @@ bool QWasmCompositor::processPointer(const PointerEvent& event) switch (event.type) { case EventType::PointerDown: { + screen()->canvas().call("setPointerCapture", event.pointerId); + if (targetWindow) targetWindow->requestActivate(); @@ -619,6 +621,8 @@ bool QWasmCompositor::processPointer(const PointerEvent& event) } case EventType::PointerUp: { + screen()->canvas().call("releasePointerCapture", event.pointerId); + m_windowManipulation.onPointerUp(event); if (m_pressedWindow) { @@ -779,8 +783,6 @@ void QWasmCompositor::WindowManipulation::onPointerDown( .window = windowAtPoint, .operationSpecific = std::move(*operationSpecific), }); - - m_screen->canvas().call("setPointerCapture", event.pointerId); } void QWasmCompositor::WindowManipulation::onPointerMove( @@ -818,7 +820,6 @@ void QWasmCompositor::WindowManipulation::onPointerUp(const PointerEvent& event) return; m_state.reset(); - m_screen->canvas().call("releasePointerCapture", event.pointerId); } bool QWasmCompositor::processKeyboard(int eventType, const EmscriptenKeyboardEvent *emKeyEvent) -- cgit v1.2.3