summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2017-06-23 13:32:18 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2017-07-05 15:32:10 +0000
commit5ed446102a74fc22a0d6d26f7112ca1c3721b43a (patch)
treef3df171930bc0b4e9cc333e74bb17e342d59bcd3 /src/plugins
parentf6ac7379ae0b593a2594d3c06f784109b94a28f0 (diff)
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 <thomas@sondergaard.cc> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/platforms/windows/qwindowswindow.cpp2
1 files changed, 2 insertions, 0 deletions
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);
}