diff options
| author | Even Oscar Andersen <[email protected]> | 2024-10-02 13:12:22 +0200 |
|---|---|---|
| committer | Even Oscar Andersen <[email protected]> | 2024-10-15 17:25:47 +0200 |
| commit | d69348ed4d659f9408ce74f3b08ee7e9104dde00 (patch) | |
| tree | b1c75017febb8106347d8c965ed72bec374e30f8 /src/plugins/platforms/wasm/qwasmwindowtreenode.cpp | |
| parent | 9b11c3736e9ff23b0febce80c3f488099f1229fc (diff) | |
wasm: Fix tooltip visible
Fixes a problem where tooltips only worked for the first instance
activated.
Fixes: QTBUG-129234
Pick-to: 6.8
Change-Id: I45619b1ca8001b74b148b98a8795000630dcacf7
Reviewed-by: Morten Johan Sørvig <[email protected]>
Diffstat (limited to 'src/plugins/platforms/wasm/qwasmwindowtreenode.cpp')
| -rw-r--r-- | src/plugins/platforms/wasm/qwasmwindowtreenode.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/plugins/platforms/wasm/qwasmwindowtreenode.cpp b/src/plugins/platforms/wasm/qwasmwindowtreenode.cpp index ea8d8dbcfab..f11adf9b78c 100644 --- a/src/plugins/platforms/wasm/qwasmwindowtreenode.cpp +++ b/src/plugins/platforms/wasm/qwasmwindowtreenode.cpp @@ -42,9 +42,13 @@ void QWasmWindowTreeNode::onSubtreeChanged(QWasmWindowTreeNodeChangeType changeT && m_childStack.topWindow() && m_childStack.topWindow()->window()) { + const auto flags = m_childStack.topWindow()->window()->flags(); + const bool notToolOrPopup = ((flags & Qt::ToolTip) != Qt::ToolTip) && ((flags & Qt::Popup) != Qt::Popup); const QVariant showWithoutActivating = m_childStack.topWindow()->window()->property("_q_showWithoutActivating"); - if (!showWithoutActivating.isValid() || !showWithoutActivating.toBool()) - m_childStack.topWindow()->requestActivateWindow(); + if (!showWithoutActivating.isValid() || !showWithoutActivating.toBool()) { + if (notToolOrPopup) + m_childStack.topWindow()->requestActivateWindow(); + } } if (parentNode()) |