diff options
| author | Paul Wicking <paul.wicking@qt.io> | 2019-02-01 13:33:25 +0100 |
|---|---|---|
| committer | Paul Wicking <paul.wicking@qt.io> | 2019-02-01 13:33:26 +0100 |
| commit | 2bc362c9fa37455afbeb56e5f1852188ede3eab4 (patch) | |
| tree | b89e3c2c082a0285e8cd91733ddbc772fe4362a5 /src/plugins/platforms/windows/qwindowspointerhandler.h | |
| parent | 5de981d3bc3df874f9df35a6899345f4f61fa951 (diff) | |
| parent | 481db443d502c8ebc169b7256cb696428cf02199 (diff) | |
Merge dev into 5.13
Change-Id: I8113c6d8735a151bd152e6096f8c8b8e63a05474
Diffstat (limited to 'src/plugins/platforms/windows/qwindowspointerhandler.h')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowspointerhandler.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/plugins/platforms/windows/qwindowspointerhandler.h b/src/plugins/platforms/windows/qwindowspointerhandler.h index 3861ebf9192..ec3179e8218 100644 --- a/src/plugins/platforms/windows/qwindowspointerhandler.h +++ b/src/plugins/platforms/windows/qwindowspointerhandler.h @@ -46,6 +46,7 @@ #include <QtCore/qpointer.h> #include <QtCore/qscopedpointer.h> #include <QtCore/qhash.h> +#include <qpa/qwindowsysteminterface.h> QT_BEGIN_NAMESPACE @@ -68,12 +69,16 @@ private: bool translateMouseTouchPadEvent(QWindow *window, HWND hwnd, QtWindows::WindowsEventType et, MSG msg, PVOID vPointerInfo); bool translateTouchEvent(QWindow *window, HWND hwnd, QtWindows::WindowsEventType et, MSG msg, PVOID vTouchInfo, unsigned int count); bool translatePenEvent(QWindow *window, HWND hwnd, QtWindows::WindowsEventType et, MSG msg, PVOID vPenInfo); + void handleCaptureRelease(QWindow *window, QWindow *currentWindowUnderPointer, HWND hwnd, QEvent::Type eventType, Qt::MouseButtons mouseButtons); + void handleEnterLeave(QWindow *window, QWindow *currentWindowUnderPointer, QPoint globalPos); QTouchDevice *m_touchDevice = nullptr; QHash<int, QPointF> m_lastTouchPositions; QPointer<QWindow> m_windowUnderPointer; QPointer<QWindow> m_currentWindow; + QWindow *m_previousCaptureWindow = nullptr; bool m_needsEnterOnPointerUpdate = false; + DWORD m_lastPointerType = 0; }; QT_END_NAMESPACE |