diff options
| author | Mikolaj Boc <mikolaj.boc@qt.io> | 2022-11-28 15:24:58 +0100 |
|---|---|---|
| committer | Mikolaj Boc <mikolaj.boc@qt.io> | 2022-11-30 20:05:10 +0100 |
| commit | a812d1eb661ea5acedc3258405a1035781e3956b (patch) | |
| tree | 80cffefd1a17aa61951fc4229e11f608d3a9948d /src/plugins/platforms/wasm/qwasmcompositor.cpp | |
| parent | a9005a70d543db8c458f670a43c586d077b12417 (diff) | |
Don't tie compositor's enabled state to last added window
Currently, the compositor gets enabled/disabled based on the last
constructed window's surface type. This causes non-OpenGL windows not to
be displayed if any OpenGL window is created last.
The compositor should scan for any non-openGL windows on any change
to the window set to decide if it needs to be disabled or not.
Change-Id: I037470e39a3fbae50fd3a4e29cb6615130d7b114
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Diffstat (limited to 'src/plugins/platforms/wasm/qwasmcompositor.cpp')
| -rw-r--r-- | src/plugins/platforms/wasm/qwasmcompositor.cpp | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/plugins/platforms/wasm/qwasmcompositor.cpp b/src/plugins/platforms/wasm/qwasmcompositor.cpp index ad8a4508cee..b68f380fe7b 100644 --- a/src/plugins/platforms/wasm/qwasmcompositor.cpp +++ b/src/plugins/platforms/wasm/qwasmcompositor.cpp @@ -149,11 +149,6 @@ void QWasmCompositor::initEventHandlers() emscripten::val(quintptr(reinterpret_cast<void *>(screen())))); } -void QWasmCompositor::setEnabled(bool enabled) -{ - m_isEnabled = enabled; -} - void QWasmCompositor::startResize(Qt::Edges edges) { m_windowManipulation.startResize(edges); @@ -163,6 +158,8 @@ void QWasmCompositor::addWindow(QWasmWindow *window) { m_windowStack.pushWindow(window); m_windowStack.topWindow()->requestActivateWindow(); + + updateEnabledState(); } void QWasmCompositor::removeWindow(QWasmWindow *window) @@ -171,6 +168,15 @@ void QWasmCompositor::removeWindow(QWasmWindow *window) m_windowStack.removeWindow(window); if (m_windowStack.topWindow()) m_windowStack.topWindow()->requestActivateWindow(); + + updateEnabledState(); +} + +void QWasmCompositor::updateEnabledState() +{ + m_isEnabled = std::any_of(m_windowStack.begin(), m_windowStack.end(), [](QWasmWindow *window) { + return !window->context2d().isUndefined(); + }); } void QWasmCompositor::raise(QWasmWindow *window) |