diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2018-02-02 09:28:17 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2018-02-02 09:13:14 +0000 |
| commit | ed6ec7449a16407e4c3aef7a7a64924b9a748513 (patch) | |
| tree | e3e80174754c485954713ecf1cb7bff76d671c20 | |
| parent | a843884697602891d21b9f9bc62603548dd6a6b8 (diff) | |
| download | qtquickcontrols-ed6ec7449a16407e4c3aef7a7a64924b9a748513.tar.gz | |
QQuickMenu1::__popup(): Scale target rectangle
Same as 223c15 for QQC2. The QPlatform* classes operate in native pixels.
Task-number: QTBUG-55251
Change-Id: I4a3fa64313a6035dab96906fa57a27240e080678
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| -rw-r--r-- | src/controls/qquickmenu.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/controls/qquickmenu.cpp b/src/controls/qquickmenu.cpp index d309b67e..3c6d91ef 100644 --- a/src/controls/qquickmenu.cpp +++ b/src/controls/qquickmenu.cpp @@ -45,6 +45,7 @@ #include <qdebug.h> #include <qabstractitemmodel.h> #include <qcursor.h> +#include <private/qhighdpiscaling_p.h> #include <private/qguiapplication_p.h> #include <QtGui/qpa/qplatformtheme.h> #include <QtGui/qpa/qplatformmenu.h> @@ -456,7 +457,9 @@ void QQuickMenu1::__popup(const QRectF &targetRect, int atItemIndex, MenuType me } globalTargetRect.translate(renderOffset); m_platformMenu->setMenuType(QPlatformMenu::MenuType(menuType)); - m_platformMenu->showPopup(parentWindow, globalTargetRect.toRect(), atItem ? atItem->platformItem() : 0); + m_platformMenu->showPopup(parentWindow, + QHighDpi::toNativePixels(globalTargetRect.toRect(), parentWindow), + atItem ? atItem->platformItem() : 0); } else { m_popupWindow = new QQuickMenuPopupWindow1(this); if (visualItem()) |