diff --git a/src/plugins/platforms/wasm/qwasmwindow.cpp b/src/plugins/platforms/wasm/qwasmwindow.cpp index f7bc2dc4a78..48d01ef6b58 100644 --- a/src/plugins/platforms/wasm/qwasmwindow.cpp +++ b/src/plugins/platforms/wasm/qwasmwindow.cpp @@ -407,20 +407,19 @@ void QWasmWindow::requestUpdate() bool QWasmWindow::hasTitleBar() const { - auto flags = window()->flags(); + Qt::WindowFlags flags = window()->flags(); return !(m_windowState & Qt::WindowFullScreen) && flags.testFlag(Qt::WindowTitleHint) - && !flags.testFlag(Qt::ToolTip) + && !(windowIsPopupType(flags)) && m_needsCompositor; } -bool QWasmWindow::windowIsPopupType(Qt::WindowType type) const +bool QWasmWindow::windowIsPopupType(Qt::WindowFlags flags) const { - if (type == Qt::Widget) - type = window()->type(); - if (type != Qt::Tool) - return true; - return false; + if (flags.testFlag(Qt::Tool)) + return false; // Qt::Tool has the Popup bit set but isn't + + return (flags.testFlag(Qt::Popup)); } void QWasmWindow::requestActivateWindow() diff --git a/src/plugins/platforms/wasm/qwasmwindow.h b/src/plugins/platforms/wasm/qwasmwindow.h index f99c69fc799..870377ce297 100644 --- a/src/plugins/platforms/wasm/qwasmwindow.h +++ b/src/plugins/platforms/wasm/qwasmwindow.h @@ -124,7 +124,7 @@ protected: bool m_needsCompositor = false; friend class QWasmCompositor; friend class QWasmEventTranslator; - bool windowIsPopupType(Qt::WindowType type = Qt::Widget) const; + bool windowIsPopupType(Qt::WindowFlags flags) const; }; QT_END_NAMESPACE #endif // QWASMWINDOW_H