From f35e5a44b0d148ede055a11c89fcd7e9920f0b85 Mon Sep 17 00:00:00 2001 From: Mikolaj Boc Date: Mon, 1 Aug 2022 14:35:43 +0200 Subject: [PATCH] Implement mouse capture on WASM This fixes dock widget undocking - previously, without the capture, any widget that the mouse accidentally entered would get the event, resulting in re-docking problems, cursor issues etc. Fixes: QTBUG-105621 Pick-to: 6.4 Change-Id: Ia1f2c91578018f2ae9df903bc0730200ede17d32 Reviewed-by: Lorn Potter --- .../platforms/wasm/qwasmcompositor.cpp | 24 +++++++++++++++---- src/plugins/platforms/wasm/qwasmcompositor.h | 3 +++ src/plugins/platforms/wasm/qwasmwindow.cpp | 9 +++++++ src/plugins/platforms/wasm/qwasmwindow.h | 2 +- 4 files changed, 32 insertions(+), 6 deletions(-) diff --git a/src/plugins/platforms/wasm/qwasmcompositor.cpp b/src/plugins/platforms/wasm/qwasmcompositor.cpp index 8f9a6bb72b3..5c13e27880b 100644 --- a/src/plugins/platforms/wasm/qwasmcompositor.cpp +++ b/src/plugins/platforms/wasm/qwasmcompositor.cpp @@ -581,9 +581,10 @@ bool QWasmCompositor::processPointer(const PointerEvent& event) const QPoint targetPointInScreenCoords = screen()->geometry().topLeft() + event.point; QWindow *const targetWindow = ([this, &targetPointInScreenCoords]() -> QWindow * { - auto *targetWindow = - m_windowManipulation.operation() == WindowManipulation::Operation::None ? - screen()->compositor()->windowAt(targetPointInScreenCoords, 5) : nullptr; + auto *targetWindow = m_mouseCaptureWindow != nullptr ? m_mouseCaptureWindow.get() + : m_windowManipulation.operation() == WindowManipulation::Operation::None + ? screen()->compositor()->windowAt(targetPointInScreenCoords, 5) + : nullptr; return targetWindow ? targetWindow : m_lastMouseTargetWindow.get(); })(); @@ -679,6 +680,8 @@ bool QWasmCompositor::processPointer(const PointerEvent& event) bool QWasmCompositor::deliverEventToTarget(const PointerEvent &event, QWindow *eventTarget) { + Q_ASSERT(!m_mouseCaptureWindow || m_mouseCaptureWindow.get() == eventTarget); + const QPoint pointInScreenCoords = screen()->geometry().topLeft() + event.point; const QPoint targetPointClippedToScreen( std::max(screen()->geometry().left(), @@ -698,8 +701,8 @@ bool QWasmCompositor::deliverEventToTarget(const PointerEvent &event, QWindow *e } WindowArea windowArea = WindowArea::Client; - if (!eventTarget->geometry().contains(targetPointClippedToScreen) - && !deliveringToPreviouslyClickedWindow) { + if (!deliveringToPreviouslyClickedWindow && !m_mouseCaptureWindow + && !eventTarget->geometry().contains(targetPointClippedToScreen)) { if (!eventTarget->frameGeometry().contains(targetPointClippedToScreen)) return false; windowArea = WindowArea::NonClient; @@ -972,6 +975,17 @@ int QWasmCompositor::handleTouch(int eventType, const EmscriptenTouchEvent *touc return static_cast(accepted); } +void QWasmCompositor::setCapture(QWasmWindow *window) +{ + Q_ASSERT(std::find(m_windowStack.begin(), m_windowStack.end(), window) != m_windowStack.end()); + m_mouseCaptureWindow = window->window(); +} + +void QWasmCompositor::releaseCapture() +{ + m_mouseCaptureWindow = nullptr; +} + void QWasmCompositor::leaveWindow(QWindow *window) { m_windowUnderMouse = nullptr; diff --git a/src/plugins/platforms/wasm/qwasmcompositor.h b/src/plugins/platforms/wasm/qwasmcompositor.h index 09879d52d2f..3609f44c5e4 100644 --- a/src/plugins/platforms/wasm/qwasmcompositor.h +++ b/src/plugins/platforms/wasm/qwasmcompositor.h @@ -82,6 +82,8 @@ public: bool processKeyboard(int eventType, const EmscriptenKeyboardEvent *keyEvent); bool processWheel(int eventType, const EmscriptenWheelEvent *wheelEvent); int handleTouch(int eventType, const EmscriptenTouchEvent *touchEvent); + void setCapture(QWasmWindow *window); + void releaseCapture(); bool processMouseEnter(const EmscriptenMouseEvent *mouseEvent); bool processMouseLeave(); @@ -173,6 +175,7 @@ private: QPointer m_pressedWindow; QPointer m_lastMouseTargetWindow; + QPointer m_mouseCaptureWindow; std::unique_ptr m_pointerDownCallback; std::unique_ptr m_pointerMoveCallback; diff --git a/src/plugins/platforms/wasm/qwasmwindow.cpp b/src/plugins/platforms/wasm/qwasmwindow.cpp index 99803e5d207..9bf23cfcf53 100644 --- a/src/plugins/platforms/wasm/qwasmwindow.cpp +++ b/src/plugins/platforms/wasm/qwasmwindow.cpp @@ -605,4 +605,13 @@ void QWasmWindow::requestActivateWindow() QPlatformWindow::requestActivateWindow(); } +bool QWasmWindow::setMouseGrabEnabled(bool grab) +{ + if (grab) + m_compositor->setCapture(this); + else + m_compositor->releaseCapture(); + return true; +} + QT_END_NAMESPACE diff --git a/src/plugins/platforms/wasm/qwasmwindow.h b/src/plugins/platforms/wasm/qwasmwindow.h index 3ec1f3405e7..0af8d4df6c0 100644 --- a/src/plugins/platforms/wasm/qwasmwindow.h +++ b/src/plugins/platforms/wasm/qwasmwindow.h @@ -65,7 +65,7 @@ public: void setWindowState(Qt::WindowStates state) override; void applyWindowState(); bool setKeyboardGrabEnabled(bool) override { return false; } - bool setMouseGrabEnabled(bool) override { return false; } + bool setMouseGrabEnabled(bool grab) final; void drawTitleBar(QPainter *painter) const;