diff options
| author | Samuel Nevala <samuel.nevala@intopalo.com> | 2015-09-04 12:50:12 +0300 |
|---|---|---|
| committer | Samuel Nevala <samuel.nevala@intopalo.com> | 2015-09-07 11:09:07 +0000 |
| commit | 6313ff8a6298d221f0ededba12d6e4a9de777c98 (patch) | |
| tree | 65147c89df18a9d459944a33980481218f4c50fe /src/plugins/platforms/winrt | |
| parent | 296422fc636acce0af3afc5824dcc3128f319f7c (diff) | |
winrt: Fix top level window geometry.
Set screen geometry only for top level window.
For other window types (dialog, popup and etc.) use
their own geometry.
Change-Id: I47e45a9fc6f08587ea284d89d56e419907471572
Task-Id: QTBUG-48089
Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
Diffstat (limited to 'src/plugins/platforms/winrt')
| -rw-r--r-- | src/plugins/platforms/winrt/qwinrtwindow.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/platforms/winrt/qwinrtwindow.cpp b/src/plugins/platforms/winrt/qwinrtwindow.cpp index 23e4e163e4..cebc9e15c2 100644 --- a/src/plugins/platforms/winrt/qwinrtwindow.cpp +++ b/src/plugins/platforms/winrt/qwinrtwindow.cpp @@ -196,8 +196,9 @@ void QWinRTWindow::setGeometry(const QRect &rect) { Q_D(QWinRTWindow); - if (window()->isTopLevel()) { - QPlatformWindow::setGeometry(window()->flags() & Qt::MaximizeUsingFullscreenGeometryHint + const Qt::WindowFlags windowFlags = window()->flags(); + if (window()->isTopLevel() && (windowFlags & Qt::WindowType_Mask) == Qt::Window) { + QPlatformWindow::setGeometry(windowFlags & Qt::MaximizeUsingFullscreenGeometryHint ? d->screen->geometry() : d->screen->availableGeometry()); QWindowSystemInterface::handleGeometryChange(window(), geometry()); } else { |