diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-18 20:59:10 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-18 21:00:09 +0100 |
| commit | 6c9f0bfcc4bc6511686559dd87c29cfaa3e88b33 (patch) | |
| tree | 2ce51a6a80fca98a9dae34508ef07bddf44e6ba9 | |
| parent | 25d6bd04611837cbc81f6a1247c3008f08ed9f9d (diff) | |
| parent | 93c5dc8b5abdbdfca505dd4d3d9892856d1f51d7 (diff) | |
| download | qtquickcontrols-6c9f0bfcc4bc6511686559dd87c29cfaa3e88b33.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into 5.11v5.11.0-beta1
Conflicts:
.qmake.conf
Change-Id: I3c4c27d0942058c8d8c325f92688675c14887a4b
| -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()) |