diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-04-11 15:22:35 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-02-01 14:00:58 +0000 |
commit | 223c1524a7693e2c0f2312dd738c6aeb484358a5 (patch) | |
tree | 50639367e7892f26a00493262216e416a85be56b | |
parent | c3858bd53974e486e03537d1937deb0020828556 (diff) |
QQuickPlatformMenu::open(): Scale target rectangle
The QPlatform* classes operate in native pixels.
Task-number: QTBUG-55251
Change-Id: Ic9715bc062f7459054ed9735d133b1a5d05b60a2
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
-rw-r--r-- | src/imports/platform/qquickplatformmenu.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/imports/platform/qquickplatformmenu.cpp b/src/imports/platform/qquickplatformmenu.cpp index 82adb6c3..ec5c4804 100644 --- a/src/imports/platform/qquickplatformmenu.cpp +++ b/src/imports/platform/qquickplatformmenu.cpp @@ -44,6 +44,7 @@ #include <QtGui/qcursor.h> #include <QtGui/qpa/qplatformtheme.h> #include <QtGui/private/qguiapplication_p.h> +#include <QtGui/private/qhighdpiscaling_p.h> #include <QtQml/private/qqmlengine_p.h> #include <QtQml/private/qv4scopedvalue_p.h> #include <QtQml/private/qv4qobjectwrapper_p.h> @@ -705,8 +706,9 @@ void QQuickPlatformMenu::open(QQmlV4Function *args) targetRect.moveTo(pos); #endif } - - m_handle->showPopup(window, targetRect, menuItem ? menuItem->handle() : nullptr); + m_handle->showPopup(window, + QHighDpi::toNativePixels(targetRect, window), + menuItem ? menuItem->handle() : nullptr); } /*! |