diff options
| author | Sergio Martins <sergio.martins@kdab.com> | 2022-02-09 18:12:25 +0000 |
|---|---|---|
| committer | Sergio Martins <iamsergio@gmail.com> | 2022-03-04 22:53:44 +0000 |
| commit | 006aa6c2ee3f4b1b01d3847bbaa5e66a1d386d6e (patch) | |
| tree | 66efab48bb13f3af589648b3ac999e5d21a3277e /src/gui/kernel/qwindow.cpp | |
| parent | daf7f07c1bb00028d7bce6b030f5ade8c4d0da59 (diff) | |
Fix QWindow::mapTo|FromGlobal() for the embedded case
The code didn't make much sense:
- QHighDpi::fromNativeLocalPosition should not take global positions
- QPlatformWindow::mapFromGlobal() should not take local positions
Tested with a basic MFC window that has a QMainWindow as child
(parented with QWinWidget from QtWinMigrate). Menus would be off
when on a secondary screen with dpi factor > 1
Change-Id: Ib5cbf5d29ed97c786f7f7ba4e868b70cb5435239
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Diffstat (limited to 'src/gui/kernel/qwindow.cpp')
| -rw-r--r-- | src/gui/kernel/qwindow.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp index f2dacda0f5..ec0ee73660 100644 --- a/src/gui/kernel/qwindow.cpp +++ b/src/gui/kernel/qwindow.cpp @@ -2763,7 +2763,7 @@ QPointF QWindow::mapToGlobal(const QPointF &pos) const // QTBUG-43252, prefer platform implementation for foreign windows. if (d->platformWindow && (d->platformWindow->isForeignWindow() || d->platformWindow->isEmbedded())) { - return QHighDpi::fromNativeLocalPosition(d->platformWindow->mapToGlobalF(QHighDpi::toNativeLocalPosition(pos, this)), this); + return QHighDpi::fromNativeGlobalPosition(d->platformWindow->mapToGlobalF(QHighDpi::toNativeLocalPosition(pos, this)), this); } if (!QHighDpiScaling::isActive()) @@ -2805,7 +2805,7 @@ QPointF QWindow::mapFromGlobal(const QPointF &pos) const // QTBUG-43252, prefer platform implementation for foreign windows. if (d->platformWindow && (d->platformWindow->isForeignWindow() || d->platformWindow->isEmbedded())) { - return QHighDpi::fromNativeLocalPosition(d->platformWindow->mapFromGlobalF(QHighDpi::toNativeLocalPosition(pos, this)), this); + return QHighDpi::fromNativeLocalPosition(d->platformWindow->mapFromGlobalF(QHighDpi::toNativeGlobalPosition(pos, this)), this); } if (!QHighDpiScaling::isActive()) |