diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-03-31 18:36:53 +0200 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-04-25 08:36:47 +0000 |
| commit | f569af401aae651ea9bfa1f3a8ff68a58f8d71d1 (patch) | |
| tree | 8ea20f278b3df8d8852f2633feaba4178787e329 /src/quick/handlers/qquickpointerdevicehandler_p.h | |
| parent | b8dbafcae9ccfbf5c2ef7a173c51a73e57476681 (diff) | |
QQuickPointerDeviceHandler: add acceptedModifiers
Sometimes you want to require holding down a key in order to enable
some interaction. As with the other "accepted" flags, it's better to
do this with a property than with Javascript.
Change-Id: Ie29880f5f9f496ddca1bee462e2c0e6dd30fa9f5
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
Diffstat (limited to 'src/quick/handlers/qquickpointerdevicehandler_p.h')
| -rw-r--r-- | src/quick/handlers/qquickpointerdevicehandler_p.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/quick/handlers/qquickpointerdevicehandler_p.h b/src/quick/handlers/qquickpointerdevicehandler_p.h index 76c9cc44f0..9e30fa0be4 100644 --- a/src/quick/handlers/qquickpointerdevicehandler_p.h +++ b/src/quick/handlers/qquickpointerdevicehandler_p.h @@ -60,6 +60,7 @@ class Q_AUTOTEST_EXPORT QQuickPointerDeviceHandler : public QQuickPointerHandler Q_OBJECT Q_PROPERTY(QQuickPointerDevice::DeviceTypes acceptedDevices READ acceptedDevices WRITE setAcceptedDevices NOTIFY acceptedDevicesChanged) Q_PROPERTY(QQuickPointerDevice::PointerTypes acceptedPointerTypes READ acceptedPointerTypes WRITE setAcceptedPointerTypes NOTIFY acceptedPointerTypesChanged) + Q_PROPERTY(Qt::KeyboardModifiers acceptedModifiers READ acceptedModifiers WRITE setAcceptedModifiers NOTIFY acceptedModifiersChanged) public: explicit QQuickPointerDeviceHandler(QObject *parent = 0); @@ -67,14 +68,17 @@ public: QQuickPointerDevice::DeviceTypes acceptedDevices() const { return m_acceptedDevices; } QQuickPointerDevice::PointerTypes acceptedPointerTypes() const { return m_acceptedPointerTypes; } + Qt::KeyboardModifiers acceptedModifiers() const { return m_acceptedModifiers; } public slots: void setAcceptedDevices(QQuickPointerDevice::DeviceTypes acceptedDevices); void setAcceptedPointerTypes(QQuickPointerDevice::PointerTypes acceptedPointerTypes); + void setAcceptedModifiers(Qt::KeyboardModifiers acceptedModifiers); Q_SIGNALS: void acceptedDevicesChanged(); void acceptedPointerTypesChanged(); + void acceptedModifiersChanged(); protected: bool wantsPointerEvent(QQuickPointerEvent *event) override; @@ -82,6 +86,7 @@ protected: protected: QQuickPointerDevice::DeviceTypes m_acceptedDevices; QQuickPointerDevice::PointerTypes m_acceptedPointerTypes; + Qt::KeyboardModifiers m_acceptedModifiers; }; QT_END_NAMESPACE |