diff options
author | Jan Arve Saether <jan-arve.saether@qt.io> | 2017-02-22 14:19:12 +0100 |
---|---|---|
committer | Jan Arve Sæther <jan-arve.saether@qt.io> | 2017-02-23 12:29:10 +0000 |
commit | e53510944169ac9f6753e0d14e1b24a24ff7bd9a (patch) | |
tree | 117b20c0045b0fcf4a0dd2f744068e75b607731d /src/quick/handlers/qquickpointerdevicehandler.cpp | |
parent | ac61ca1a2e18bd472d36fdad730a797a913fe347 (diff) |
API: Move acceptedButtons to QQuickPointerSingleHandler
Change-Id: I8cb393986e587e69d550ec03f691258c79d9237a
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/quick/handlers/qquickpointerdevicehandler.cpp')
-rw-r--r-- | src/quick/handlers/qquickpointerdevicehandler.cpp | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/src/quick/handlers/qquickpointerdevicehandler.cpp b/src/quick/handlers/qquickpointerdevicehandler.cpp index 03704ac09e..3a320fdb32 100644 --- a/src/quick/handlers/qquickpointerdevicehandler.cpp +++ b/src/quick/handlers/qquickpointerdevicehandler.cpp @@ -53,7 +53,6 @@ QQuickPointerDeviceHandler::QQuickPointerDeviceHandler(QObject *parent) : QQuickPointerHandler(parent) , m_acceptedDevices(QQuickPointerDevice::AllDevices) , m_acceptedPointerTypes(QQuickPointerDevice::AllPointerTypes) - , m_acceptedButtons(Qt::AllButtons) { } @@ -79,30 +78,17 @@ void QQuickPointerDeviceHandler::setAcceptedPointerTypes(QQuickPointerDevice::Po emit acceptedPointerTypesChanged(); } -void QQuickPointerDeviceHandler::setAcceptedButtons(Qt::MouseButtons buttons) -{ - if (m_acceptedButtons == buttons) - return; - - m_acceptedButtons = buttons; - emit acceptedButtonsChanged(); -} - bool QQuickPointerDeviceHandler::wantsPointerEvent(QQuickPointerEvent *event) { if (!QQuickPointerHandler::wantsPointerEvent(event)) return false; qCDebug(lcPointerHandlerDispatch) << objectName() << "checking device type" << m_acceptedDevices - << "pointer type" << m_acceptedPointerTypes - << "buttons" << m_acceptedButtons; + << "pointer type" << m_acceptedPointerTypes; if ((event->device()->type() & m_acceptedDevices) == 0) return false; if ((event->device()->pointerType() & m_acceptedPointerTypes) == 0) return false; - if (event->device()->pointerType() != QQuickPointerDevice::Finger && - (event->buttons() & m_acceptedButtons) == 0 && (event->button() & m_acceptedButtons) == 0) - return false; return true; } |