diff options
| author | Morten Sørvig <[email protected]> | 2025-01-27 13:06:41 +0100 |
|---|---|---|
| committer | Morten Sørvig <[email protected]> | 2025-01-29 15:04:22 +0100 |
| commit | 31762e2e704673057a292ac59977b501919f2450 (patch) | |
| tree | 688917690be49b7dc3ddc5dfe3740d202b842e18 /src/plugins/platforms/wasm/qwasmwindow.cpp | |
| parent | a9bbcdd7bf0580cf7c0a8faa9779357758d45681 (diff) | |
wasm: don't give native focus to non-focus windows
isActive() may return true if a (transient) parent window
is active (has focus).
Compare against QGuiApplication::focusWindow() instead.
Fixes: QTBUG-129233
Pick-to: 6.8 6.9
Change-Id: I834a5814a5db161bdea2ba3524d1010e0c0e3e6e
Reviewed-by: Even Oscar Andersen <[email protected]>
Reviewed-by: Piotr Wierciński <[email protected]>
Reviewed-by: Lorn Potter <[email protected]>
Diffstat (limited to 'src/plugins/platforms/wasm/qwasmwindow.cpp')
| -rw-r--r-- | src/plugins/platforms/wasm/qwasmwindow.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/wasm/qwasmwindow.cpp b/src/plugins/platforms/wasm/qwasmwindow.cpp index dc092416bd8..a8930ca6472 100644 --- a/src/plugins/platforms/wasm/qwasmwindow.cpp +++ b/src/plugins/platforms/wasm/qwasmwindow.cpp @@ -378,7 +378,7 @@ void QWasmWindow::setVisible(bool visible) m_compositor->requestUpdateWindow(this, QRect(QPoint(0, 0), geometry().size()), QWasmCompositor::ExposeEventDelivery); m_decoratedWindow["style"].set("display", visible ? "block" : "none"); - if (window()->isActive()) + if (window() == QGuiApplication::focusWindow()) m_canvas.call<void>("focus"); if (visible) applyWindowState(); |