diff options
| -rw-r--r-- | src/plugins/platforms/wasm/qwasmcssstyle.cpp | 3 | ||||
| -rw-r--r-- | src/plugins/platforms/wasm/qwasmwindow.cpp | 15 | ||||
| -rw-r--r-- | src/plugins/platforms/wasm/qwasmwindow.h | 1 |
3 files changed, 6 insertions, 13 deletions
diff --git a/src/plugins/platforms/wasm/qwasmcssstyle.cpp b/src/plugins/platforms/wasm/qwasmcssstyle.cpp index 99983dcc8ed..9f999cbcdba 100644 --- a/src/plugins/platforms/wasm/qwasmcssstyle.cpp +++ b/src/plugins/platforms/wasm/qwasmcssstyle.cpp @@ -165,9 +165,8 @@ const char *Style = R"css( opacity: 0.35; } -.qt-window-canvas-container { +.qt-window-contents { display: flex; - pointer-events: none; } .title-bar div { diff --git a/src/plugins/platforms/wasm/qwasmwindow.cpp b/src/plugins/platforms/wasm/qwasmwindow.cpp index ba325bac121..3b898eb29b3 100644 --- a/src/plugins/platforms/wasm/qwasmwindow.cpp +++ b/src/plugins/platforms/wasm/qwasmwindow.cpp @@ -57,7 +57,6 @@ QWasmWindow::QWasmWindow(QWindow *w, QWasmDeadKeySupport *deadKeySupport, m_document(dom::document()), m_qtWindow(m_document.call<emscripten::val>("createElement", emscripten::val("div"))), m_windowContents(m_document.call<emscripten::val>("createElement", emscripten::val("div"))), - m_canvasContainer(m_document.call<emscripten::val>("createElement", emscripten::val("div"))), m_a11yContainer(m_document.call<emscripten::val>("createElement", emscripten::val("div"))), m_canvas(m_document.call<emscripten::val>("createElement", emscripten::val("canvas"))) { @@ -87,14 +86,10 @@ QWasmWindow::QWasmWindow(QWindow *w, QWasmDeadKeySupport *deadKeySupport, // Hide the canvas from screen readers. m_canvas.call<void>("setAttribute", std::string("aria-hidden"), std::string("true")); + m_windowContents.call<void>("appendChild", m_canvas); - m_windowContents.call<void>("appendChild", m_canvasContainer); - - m_canvasContainer["classList"].call<void>("add", emscripten::val("qt-window-canvas-container")); - m_canvasContainer.call<void>("appendChild", m_canvas); - - m_canvasContainer.call<void>("appendChild", m_a11yContainer); m_a11yContainer["classList"].call<void>("add", emscripten::val("qt-window-a11y-container")); + m_windowContents.call<void>("appendChild", m_a11yContainer); const bool rendersTo2dContext = w->surfaceType() != QSurface::OpenGLSurface; if (rendersTo2dContext) @@ -134,7 +129,7 @@ QWasmWindow::QWasmWindow(QWindow *w, QWasmDeadKeySupport *deadKeySupport, QWasmWindow::~QWasmWindow() { emscripten::val::module_property("specialHTMLTargets").delete_(canvasSelector()); - m_canvasContainer.call<void>("removeChild", m_canvas); + m_windowContents.call<void>("removeChild", m_canvas); m_context2d = emscripten::val::undefined(); commitParent(nullptr); if (m_requestAnimationFrameId > -1) @@ -282,8 +277,8 @@ void QWasmWindow::setGeometry(const QRect &rect) m_qtWindow["style"].set("left", std::to_string(frameRect.left()) + "px"); m_qtWindow["style"].set("top", std::to_string(frameRect.top()) + "px"); - m_canvasContainer["style"].set("width", std::to_string(clientAreaRect.width()) + "px"); - m_canvasContainer["style"].set("height", std::to_string(clientAreaRect.height()) + "px"); + m_canvas["style"].set("width", std::to_string(clientAreaRect.width()) + "px"); + m_canvas["style"].set("height", std::to_string(clientAreaRect.height()) + "px"); m_a11yContainer["style"].set("width", std::to_string(clientAreaRect.width()) + "px"); m_a11yContainer["style"].set("height", std::to_string(clientAreaRect.height()) + "px"); diff --git a/src/plugins/platforms/wasm/qwasmwindow.h b/src/plugins/platforms/wasm/qwasmwindow.h index 9e259e58f68..6c6b5b7cbdb 100644 --- a/src/plugins/platforms/wasm/qwasmwindow.h +++ b/src/plugins/platforms/wasm/qwasmwindow.h @@ -141,7 +141,6 @@ private: emscripten::val m_document; emscripten::val m_qtWindow; emscripten::val m_windowContents; - emscripten::val m_canvasContainer; emscripten::val m_a11yContainer; emscripten::val m_canvas; emscripten::val m_context2d = emscripten::val::undefined(); |