From 6313ff8a6298d221f0ededba12d6e4a9de777c98 Mon Sep 17 00:00:00 2001 From: Samuel Nevala Date: Fri, 4 Sep 2015 12:50:12 +0300 Subject: [PATCH] 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 --- src/plugins/platforms/winrt/qwinrtwindow.cpp | 5 +++-- 1 file 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 {