From da5dc2062576b75b6427fcc2bc74dc4fcfd9dcf5 Mon Sep 17 00:00:00 2001 From: Mikolaj Boc Date: Fri, 27 Jan 2023 15:01:34 +0100 Subject: Transfer touch event handling to QWasmWindow Fixes: QTBUG-103498 Change-Id: Iec8b5cfba75131e7ddf855e6b729291950888fd3 Reviewed-by: Lorn Potter Reviewed-by: Aleksandr Reviakin --- src/plugins/platforms/wasm/qwasmwindow.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/plugins/platforms/wasm/qwasmwindow.cpp') diff --git a/src/plugins/platforms/wasm/qwasmwindow.cpp b/src/plugins/platforms/wasm/qwasmwindow.cpp index 36d289e96fe..1bc09ee2704 100644 --- a/src/plugins/platforms/wasm/qwasmwindow.cpp +++ b/src/plugins/platforms/wasm/qwasmwindow.cpp @@ -54,7 +54,7 @@ QWasmWindow::QWasmWindow(QWindow *w, QWasmDeadKeySupport *deadKeySupport, m_nonClientArea = std::make_unique(this, m_qtWindow); m_nonClientArea->titleBar()->setTitle(window()->title()); - m_clientArea = std::make_unique(this, compositor->screen(), m_canvas); + m_clientArea = std::make_unique(this, compositor->screen(), m_windowContents); m_qtWindow.call("appendChild", m_windowContents); @@ -237,7 +237,7 @@ void QWasmWindow::setZOrder(int z) void QWasmWindow::setWindowCursor(QByteArray cssCursorName) { - m_canvas["style"].set("cursor", emscripten::val(cssCursorName.constData())); + m_windowContents["style"].set("cursor", emscripten::val(cssCursorName.constData())); } void QWasmWindow::setGeometry(const QRect &rect) @@ -576,7 +576,8 @@ void QWasmWindow::requestActivateWindow() if (window()->isTopLevel()) raise(); - m_canvas.call("focus"); + if (!QWasmIntegration::get()->inputContext()) + m_canvas.call("focus"); QPlatformWindow::requestActivateWindow(); } -- cgit v1.2.3