diff options
| author | Lorn Potter <lorn.potter@gmail.com> | 2021-05-20 15:48:10 +1000 |
|---|---|---|
| committer | Lorn Potter <lorn.potter@gmail.com> | 2021-05-22 07:26:48 +1000 |
| commit | 8c9fef04736a083e74ff78a7806729bc614a9e60 (patch) | |
| tree | 6662ba3b2fbff80933394f19df8bddb085c6ce3e /src/plugins | |
| parent | c3b5ca129af42056184670e154c5dd17762e41f8 (diff) | |
wasm: Fix visual representation to not show tool tip window title bar
Change-Id: I1adf841a97daa64cd8a0ae799235d99bf961171f
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/platforms/wasm/qwasmwindow.cpp | 16 | ||||
| -rw-r--r-- | src/plugins/platforms/wasm/qwasmwindow.h | 1 |
2 files changed, 15 insertions, 2 deletions
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 |