diff options
| author | David Skoland <david.skoland@qt.io> | 2021-10-14 13:22:13 +0200 |
|---|---|---|
| committer | David Skoland <david.skoland@qt.io> | 2021-10-18 13:42:06 +0200 |
| commit | 723a2c34a5e77503104a22ab53a568cdac7c6a2e (patch) | |
| tree | 12761f61c57e55321e45673ada8890075b7ed85e /src/plugins/platforms | |
| parent | 5335cc4a5a73bbd6d717989b4257660b92000fb6 (diff) | |
Make sure Qt::Popup is treated like a dialog
According to the documentation, Qt::Popup should have a proper frame
with a title bar. To honor this, two functions had to be
slightly altered.
Change-Id: I4bbc18e6b7fbec5702fad6e22ef2226c09dea15a
Fixes: QTBUG-94768
Pick-to: 5.15 6.2
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
Diffstat (limited to 'src/plugins/platforms')
| -rw-r--r-- | src/plugins/platforms/wasm/qwasmintegration.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/platforms/wasm/qwasmwindow.cpp | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/plugins/platforms/wasm/qwasmintegration.cpp b/src/plugins/platforms/wasm/qwasmintegration.cpp index 5b010c170e..3dfd8cfe12 100644 --- a/src/plugins/platforms/wasm/qwasmintegration.cpp +++ b/src/plugins/platforms/wasm/qwasmintegration.cpp @@ -248,8 +248,8 @@ QVariant QWasmIntegration::styleHint(QPlatformIntegration::StyleHint hint) const Qt::WindowState QWasmIntegration::defaultWindowState(Qt::WindowFlags flags) const { - // Don't maximize dialogs - if (flags & Qt::Dialog & ~Qt::Window) + // Don't maximize dialogs or popups + if (flags.testFlag(Qt::Dialog) || flags.testFlag(Qt::Popup)) return Qt::WindowNoState; return QPlatformIntegration::defaultWindowState(flags); diff --git a/src/plugins/platforms/wasm/qwasmwindow.cpp b/src/plugins/platforms/wasm/qwasmwindow.cpp index 1bcc407bc1..aac7413994 100644 --- a/src/plugins/platforms/wasm/qwasmwindow.cpp +++ b/src/plugins/platforms/wasm/qwasmwindow.cpp @@ -407,7 +407,6 @@ bool QWasmWindow::hasTitleBar() const auto flags = window()->flags(); return !(m_windowState & Qt::WindowFullScreen) && flags.testFlag(Qt::WindowTitleHint) - && !flags.testFlag(Qt::Popup) && !flags.testFlag(Qt::ToolTip) && m_needsCompositor; } |