From 9e61464c9026c4b766e05ea8c784f8e6a615adba Mon Sep 17 00:00:00 2001
From: Michael Brasser <michael.brasser@nokia.com>
Date: Thu, 22 Dec 2011 10:53:25 +1000
Subject: Add a pressed property to TouchPoint.

Remove the valid property, and replace it with pressed. The semantics
have changed slightly for a release -- pressed will immediately become
false, whereas valid remained true until the next touch event.

Also make sure touch information is correctly updated on release.

Change-Id: Ic61e1b6884c67f19100a6f8fc218b8b05b291ff0
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
---
 src/quick/items/qquickmultipointtoucharea_p.h | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'src/quick/items/qquickmultipointtoucharea_p.h')

diff --git a/src/quick/items/qquickmultipointtoucharea_p.h b/src/quick/items/qquickmultipointtoucharea_p.h
index aee18a376b..dbce42853b 100644
--- a/src/quick/items/qquickmultipointtoucharea_p.h
+++ b/src/quick/items/qquickmultipointtoucharea_p.h
@@ -58,8 +58,8 @@ class QQuickMultiPointTouchArea;
 class Q_AUTOTEST_EXPORT QQuickTouchPoint : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(bool valid READ isValid NOTIFY validityChanged)
     Q_PROPERTY(int pointId READ pointId NOTIFY pointIdChanged)
+    Q_PROPERTY(bool pressed READ pressed NOTIFY pressedChanged)
     Q_PROPERTY(qreal x READ x NOTIFY xChanged)
     Q_PROPERTY(qreal y READ y NOTIFY yChanged)
     Q_PROPERTY(qreal pressure READ pressure NOTIFY pressureChanged)
@@ -78,7 +78,8 @@ public:
           _x(0.0), _y(0.0),
           _pressure(0.0),
           _qmlDefined(qmlDefined),
-          _valid(!qmlDefined),
+          _inUse(false),
+          _pressed(false),
           _previousX(0.0), _previousY(0.0),
           _sceneX(0.0), _sceneY(0.0)
     {}
@@ -98,10 +99,13 @@ public:
     QRectF area() const { return _area; }
     void setArea(const QRectF &area);
 
-    bool isQmlDefined() { return _qmlDefined; }
+    bool isQmlDefined() const { return _qmlDefined; }
 
-    bool isValid() { return _valid; }
-    void setValid(bool valid);
+    bool inUse() const { return _inUse; }
+    void setInUse(bool inUse) { _inUse = inUse; }
+
+    bool pressed() const { return _pressed; }
+    void setPressed(bool pressed);
 
     qreal startX() const { return _startX; }
     void setStartX(qreal startX);
@@ -121,14 +125,13 @@ public:
     qreal sceneY() const { return _sceneY; }
     void setSceneY(qreal sceneY);
 
-
 Q_SIGNALS:
+    void pressedChanged();
     void pointIdChanged();
     void xChanged();
     void yChanged();
     void pressureChanged();
     void areaChanged();
-    void validityChanged();
     void startXChanged();
     void startYChanged();
     void previousXChanged();
@@ -144,7 +147,8 @@ private:
     qreal _pressure;
     QRectF _area;
     bool _qmlDefined;
-    bool _valid;
+    bool _inUse;    //whether the point is currently in use (only valid when _qmlDefined == true)
+    bool _pressed;
     qreal _startX;
     qreal _startY;
     qreal _previousX;
-- 
cgit v1.2.3