diff options
| author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-06-29 10:25:24 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2015-07-30 12:44:58 +0000 |
| commit | fd6821740fece8650cac7494a2cffe63e2bebb9c (patch) | |
| tree | 15f5dddd919ad3cad52a6cf1cd554fd54e0e0635 /src/plugins/platforms/windows/qwindowskeymapper.cpp | |
| parent | a705b4ec1f6f7133390054f8b6b8077ef0550311 (diff) | |
Highdpi changes for Windows
Adapt the Windows plugin to work with the new cross-platform
high-DPI scaling.
Task-number: QTBUG-38993
Task-number: QTBUG-46615
Change-Id: I108d319255925a290b75611e95ef006d4aaf7ace
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Diffstat (limited to 'src/plugins/platforms/windows/qwindowskeymapper.cpp')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowskeymapper.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/platforms/windows/qwindowskeymapper.cpp b/src/plugins/platforms/windows/qwindowskeymapper.cpp index e6fec9c8f4..3636bb7893 100644 --- a/src/plugins/platforms/windows/qwindowskeymapper.cpp +++ b/src/plugins/platforms/windows/qwindowskeymapper.cpp @@ -40,6 +40,7 @@ #include <QtGui/QWindow> #include <qpa/qwindowsysteminterface.h> #include <private/qguiapplication_p.h> +#include <private/qhighdpiscaling_p.h> #include <QtGui/QKeyEvent> #if defined(WM_APPCOMMAND) @@ -791,9 +792,10 @@ static void showSystemMenu(QWindow* w) #undef enabled #undef disabled #endif // !Q_OS_WINCE + const QPoint pos = QHighDpi::toNativePixels(topLevel->geometry().topLeft(), topLevel); const int ret = TrackPopupMenuEx(menu, TPM_LEFTALIGN | TPM_TOPALIGN | TPM_NONOTIFY | TPM_RETURNCMD, - topLevel->geometry().x(), topLevel->geometry().y(), + pos.x(), pos.y(), topLevelHwnd, 0); if (ret) |