From 5ed446102a74fc22a0d6d26f7112ca1c3721b43a Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 23 Jun 2017 13:32:18 +0200 Subject: Windows QPA: Take hasBorderInFullScreen into account when checking for fullscreen Add a margin to the window geometry. Task-number: QTBUG-61595 Change-Id: I12c557d7cfb1fe954a9845848c0777817c4cbf27 Reviewed-by: Thomas Sondergaard Reviewed-by: Oliver Wolff --- src/plugins/platforms/windows/qwindowswindow.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/plugins/platforms/windows/qwindowswindow.cpp b/src/plugins/platforms/windows/qwindowswindow.cpp index 997598496c..ff362928b6 100644 --- a/src/plugins/platforms/windows/qwindowswindow.cpp +++ b/src/plugins/platforms/windows/qwindowswindow.cpp @@ -1758,6 +1758,8 @@ bool QWindowsWindow::isFullScreen_sys() const if (!w->isTopLevel()) return false; QRect geometry = geometry_sys(); + if (testFlag(HasBorderInFullScreen)) + geometry += QMargins(1, 1, 1, 1); QPlatformScreen *screen = screenForGeometry(geometry); return screen && geometry == QHighDpi::toNativePixels(screen->geometry(), screen); } -- cgit v1.2.3