unify handler grab state handling into onGrabChanged

onGrabChanged and handleGrab looked redundant.  It was also not clear
how important it is for handlers to react to passive ungrabs, overrides
or cancellations.  Rather than debating about when to call one of these
and when not to, let's centralize the responsibility in
QQuickEventPoint (because the grabber pointers are stored there, so
it's the ultimate destination of any grab change), and let's notify
all the relevant handlers about all changes, with enough information
that each handler can decide for itself what's important and what
isn't.  But so far most handlers don't need to override this virtual.
The base class QQuickPointerHandler takes care of setting the
active property to false, rejecting the eventpoint, and unsetting
keepMouseGrab and keepTouchGrab whenever grab is lost; and emitting
grabChanged or canceled as appropriate to notify any QML code which
needs to know.  Subclasses mainly care about the change of active state:
they must initiate active state themselves, and may react when it
reverts to false.

Change-Id: I6c7f29472d12564d74ae091b0c81fa08fe131ce7
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>

1 files changed, 1 insertions, 3 deletions

diff --git a/src/quick/handlers/qquickpointerhandler_p.h b/src/quick/handlers/qquickpointerhandler_p.h
index 39362ca2e0..715000114e 100644
--- a/src/quick/handlers/qquickpointerhandler_p.h
+++ b/src/quick/handlers/qquickpointerhandler_p.h
@@ -98,12 +98,10 @@ protected:
     virtual void handlePointerEventImpl(QQuickPointerEvent *event);
     void setActive(bool active);
     virtual void onActiveChanged() { }
-    virtual void onGrabChanged(QQuickEventPoint *) { }
+    virtual void onGrabChanged(QQuickPointerHandler *grabber, QQuickEventPoint::GrabState stateChange, QQuickEventPoint *point);
     void setPassiveGrab(QQuickEventPoint *point, bool grab = true);
     void setExclusiveGrab(QQuickEventPoint *point, bool grab = true);
     void cancelAllGrabs(QQuickEventPoint *point);
-    virtual void handleGrabCancel(QQuickEventPoint *point);
-    virtual void handleGrab(QQuickEventPoint *point, QQuickPointerHandler *grabber, bool grab);
     QPointF eventPos(const QQuickEventPoint *point) const;
     bool parentContains(const QQuickEventPoint *point) const;