diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-29 01:00:09 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-29 01:00:10 +0200 |
| commit | 0e1866017fd389629629b150ce252820592506cd (patch) | |
| tree | 681142ae0e610ef7af2a43ca2d62c3ea5ed5f91a /src/plugins/platforms/wasm/qwasmwindow.cpp | |
| parent | 9567a34bc0d9be87d3b0d6cbcb841837ca1d5659 (diff) | |
| parent | 9a8175a13124e156948914854d2fda7436065b08 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I6083c3e61b7dbe188f83676f7e7bb268e5ccf2f3
Diffstat (limited to 'src/plugins/platforms/wasm/qwasmwindow.cpp')
| -rw-r--r-- | src/plugins/platforms/wasm/qwasmwindow.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/plugins/platforms/wasm/qwasmwindow.cpp b/src/plugins/platforms/wasm/qwasmwindow.cpp index 0489813929..c4167be71e 100644 --- a/src/plugins/platforms/wasm/qwasmwindow.cpp +++ b/src/plugins/platforms/wasm/qwasmwindow.cpp @@ -83,8 +83,6 @@ void QWasmWindow::initialize() setWindowState(window()->windowStates()); setWindowFlags(window()->flags()); setWindowTitle(window()->title()); - m_hasTitle = window()->flags().testFlag(Qt::WindowTitleHint) && m_needsCompositor; - if (window()->isTopLevel()) setWindowIcon(window()->icon()); m_normalGeometry = rect; @@ -135,8 +133,8 @@ void QWasmWindow::setVisible(bool visible) QMargins QWasmWindow::frameMargins() const { - int border = m_hasTitle ? 4. * (qreal(qt_defaultDpiX()) / 96.0) : 0; - int titleBarHeight = m_hasTitle ? titleHeight() : 0; + int border = hasTitleBar() ? 4. * (qreal(qt_defaultDpiX()) / 96.0) : 0; + int titleBarHeight = hasTitleBar() ? titleHeight() : 0; QMargins margins; margins.setLeft(border); @@ -177,7 +175,7 @@ void QWasmWindow::injectMousePressed(const QPoint &local, const QPoint &global, Q_UNUSED(local); Q_UNUSED(mods); - if (!m_hasTitle || button != Qt::LeftButton) + if (!hasTitleBar() || button != Qt::LeftButton) return; if (maxButtonRect().contains(global)) @@ -198,7 +196,7 @@ void QWasmWindow::injectMouseReleased(const QPoint &local, const QPoint &global, Q_UNUSED(local); Q_UNUSED(mods); - if (!m_hasTitle || button != Qt::LeftButton) + if (!hasTitleBar() || button != Qt::LeftButton) return; if (closeButtonRect().contains(global) && m_activeControl == QWasmCompositor::SC_TitleBarCloseButton) @@ -395,4 +393,9 @@ void QWasmWindow::requestUpdate() QPlatformWindow::requestUpdate(); } +bool QWasmWindow::hasTitleBar() const +{ + return !(m_windowState & Qt::WindowFullScreen) && (window()->flags().testFlag(Qt::WindowTitleHint) && m_needsCompositor); +} + QT_END_NAMESPACE |