From 8c9fef04736a083e74ff78a7806729bc614a9e60 Mon Sep 17 00:00:00 2001 From: Lorn Potter Date: Thu, 20 May 2021 15:48:10 +1000 Subject: wasm: Fix visual representation to not show tool tip window title bar MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I1adf841a97daa64cd8a0ae799235d99bf961171f Reviewed-by: Morten Johan Sørvig --- src/plugins/platforms/wasm/qwasmwindow.cpp | 16 ++++++++++++++-- src/plugins/platforms/wasm/qwasmwindow.h | 1 + 2 files changed, 15 insertions(+), 2 deletions(-) (limited to 'src/plugins/platforms') diff --git a/src/plugins/platforms/wasm/qwasmwindow.cpp b/src/plugins/platforms/wasm/qwasmwindow.cpp index f95335f891..a4fb8524c5 100644 --- a/src/plugins/platforms/wasm/qwasmwindow.cpp +++ b/src/plugins/platforms/wasm/qwasmwindow.cpp @@ -404,8 +404,20 @@ void QWasmWindow::requestUpdate() bool QWasmWindow::hasTitleBar() const { - return !(m_windowState & Qt::WindowFullScreen) && (window()->flags().testFlag(Qt::WindowTitleHint) && m_needsCompositor) - && !window()->flags().testFlag(Qt::Popup); + auto flags = window()->flags(); + return !(m_windowState & Qt::WindowFullScreen) + && flags.testFlag(Qt::WindowTitleHint) + && !flags.testFlag(Qt::Popup) + && !flags.testFlag(Qt::ToolTip) + && m_needsCompositor; +} + +bool QWasmWindow::windowIsPopupType(Qt::WindowType type) const +{ + if (type == Qt::Widget) + type = window()->type(); + if (type == Qt::Tool) + return false; } QT_END_NAMESPACE diff --git a/src/plugins/platforms/wasm/qwasmwindow.h b/src/plugins/platforms/wasm/qwasmwindow.h index a098172649..24b56a28fc 100644 --- a/src/plugins/platforms/wasm/qwasmwindow.h +++ b/src/plugins/platforms/wasm/qwasmwindow.h @@ -123,6 +123,7 @@ protected: bool m_needsCompositor = false; friend class QWasmCompositor; friend class QWasmEventTranslator; + bool windowIsPopupType(Qt::WindowType type = Qt::Widget) const; }; QT_END_NAMESPACE #endif // QWASMWINDOW_H -- cgit v1.2.3