diff options
author | Shawn Rutledge <shawn.rutledge@qt.io> | 2018-06-26 20:23:24 +0200 |
---|---|---|
committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2018-06-29 14:42:18 +0000 |
commit | 73258eca7ab7e3981d9f4aaa5484020cb67854a0 (patch) | |
tree | 72805a0605bc4c47a27fdf2a9187aca4ed6b593c /src/quick/handlers/qquicksinglepointhandler_p.h | |
parent | da722fb448f06cf43780e6f857a1ccd9f07176d6 (diff) |
Move QQSinglePointHandler::acceptedButtons to QQPointerDeviceHandler
This property must exist in DragHandler, but we're preparing to have
DragHandler inherit from MultiPointHandler. So it's no longer true
that a MultiPointHandler only handles touch events:
if minimumPointCount is set to 1, it can handle the mouse as well.
Change-Id: If6432e22b4382e79820c4d993645cf3de3b83d0c
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/quick/handlers/qquicksinglepointhandler_p.h')
-rw-r--r-- | src/quick/handlers/qquicksinglepointhandler_p.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/quick/handlers/qquicksinglepointhandler_p.h b/src/quick/handlers/qquicksinglepointhandler_p.h index 79bf74b222..7c225aab46 100644 --- a/src/quick/handlers/qquicksinglepointhandler_p.h +++ b/src/quick/handlers/qquicksinglepointhandler_p.h @@ -59,21 +59,16 @@ QT_BEGIN_NAMESPACE class Q_QUICK_PRIVATE_EXPORT QQuickSinglePointHandler : public QQuickPointerDeviceHandler { Q_OBJECT - Q_PROPERTY(Qt::MouseButtons acceptedButtons READ acceptedButtons WRITE setAcceptedButtons NOTIFY acceptedButtonsChanged) Q_PROPERTY(QQuickHandlerPoint point READ point NOTIFY pointChanged) public: explicit QQuickSinglePointHandler(QObject *parent = nullptr); virtual ~QQuickSinglePointHandler() { } - Qt::MouseButtons acceptedButtons() const { return m_acceptedButtons; } - void setAcceptedButtons(Qt::MouseButtons buttons); - QQuickHandlerPoint point() const { return m_pointInfo; } Q_SIGNALS: void pointChanged(); void singlePointGrabChanged(); // QQuickPointerHandler::grabChanged signal can't be a property notifier here - void acceptedButtonsChanged(); protected: bool wantsPointerEvent(QQuickPointerEvent *event) override; @@ -94,7 +89,6 @@ private: private: QQuickHandlerPoint m_pointInfo; - Qt::MouseButtons m_acceptedButtons; bool m_ignoreAdditionalPoints : 1; }; |