diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-21 01:00:45 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-21 01:00:46 +0200 |
| commit | eb5f02c5cc493d88bd9ff20cbf2b6ed531229263 (patch) | |
| tree | 0ddc2d2f4077db3c42a4d8cbee5c7c3554880162 /src/gui/kernel | |
| parent | 580572f3c9cb77283e63a58386002407957d7309 (diff) | |
| parent | f155c40fdc0b7bbc12804ba77c00e217ba6c2bb3 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Ib615dbfd783c5a3cf0f130ff82965382ce5cfb5a
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qhighdpiscaling.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/kernel/qhighdpiscaling.cpp b/src/gui/kernel/qhighdpiscaling.cpp index ee54fd4fa1..76548d5d86 100644 --- a/src/gui/kernel/qhighdpiscaling.cpp +++ b/src/gui/kernel/qhighdpiscaling.cpp @@ -715,8 +715,10 @@ QHighDpiScaling::ScaleAndOrigin QHighDpiScaling::scaleAndOrigin(const QWindow *w { if (!m_active) return { qreal(1), QPoint() }; + QScreen *screen = window ? window->screen() : QGuiApplication::primaryScreen(); - return scaleAndOrigin(screen, nativePosition); + const bool searchScreen = !window || window->isTopLevel(); + return scaleAndOrigin(screen, searchScreen ? nativePosition : nullptr); } #endif //QT_NO_HIGHDPISCALING |