diff options
author | Liang Qi <liang.qi@qt.io> | 2017-04-12 20:08:56 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-04-12 20:08:56 +0200 |
commit | 94c576cf6607d3e9880fdaf6c8a51216bf2d2147 (patch) | |
tree | 32e42bdb8bcb869c894023f9494c2e2df310d585 /src/widgets/kernel | |
parent | 2ad7f6ddf5042d7442c97a89b083ca2853cf5721 (diff) | |
parent | e893e657e5c976f96e7e627ca90531934129bf4b (diff) |
Merge remote-tracking branch 'origin/5.8' into 5.9
Change-Id: I3bd83a839b16822035ed56a5cffe77bd6bc3f08d
Diffstat (limited to 'src/widgets/kernel')
-rw-r--r-- | src/widgets/kernel/qdesktopwidget.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/widgets/kernel/qdesktopwidget.cpp b/src/widgets/kernel/qdesktopwidget.cpp index eee818b685..1e6fbfd239 100644 --- a/src/widgets/kernel/qdesktopwidget.cpp +++ b/src/widgets/kernel/qdesktopwidget.cpp @@ -269,12 +269,13 @@ int QDesktopWidget::screenNumber(const QWidget *w) const QRect frame = w->frameGeometry(); if (!w->isWindow()) frame.moveTopLeft(w->mapToGlobal(QPoint(0, 0))); - const QRect nativeFrame = QHighDpi::toNativePixels(frame, winHandle); QScreen *widgetScreen = Q_NULLPTR; int largestArea = 0; foreach (QScreen *screen, screens) { - const QRect intersected = screen->handle()->geometry().intersected(nativeFrame); + const QRect deviceIndependentScreenGeometry = + QHighDpi::fromNativePixels(screen->handle()->geometry(), screen); + const QRect intersected = deviceIndependentScreenGeometry.intersected(frame); int area = intersected.width() * intersected.height(); if (largestArea < area) { widgetScreen = screen; |