Don't try to maintain a current and active list of points for the app and widgets/items

Instead, build the list of touchPoints per event. This solves the problem when encountering
releases early in the active/current list while there are still touch points in move/stationary
states (which effectively caused the code to "forget" about the released point).

1 files changed, 3 insertions, 7 deletions

diff --git a/src/gui/kernel/qapplication_p.h b/src/gui/kernel/qapplication_p.h
index 34395c9..1424611 100644
--- a/src/gui/kernel/qapplication_p.h
+++ b/src/gui/kernel/qapplication_p.h
@@ -435,7 +435,6 @@ public:
     QMap<QString, int> grabbedGestures;
 
     QHash<int, QWidget *> widgetForTouchPointId;
-    QMap<QWidget *, QList<QTouchEvent::TouchPoint *> > widgetCurrentTouchPoints;
     static void updateTouchPointsForWidget(QWidget *widget, QTouchEvent *touchEvent);
 
 #if defined(Q_WS_WIN)
@@ -448,12 +447,9 @@ public:
     QList<QTouchEvent::TouchPoint *> appCurrentTouchPoints;
 
     void initializeMultitouch();
-    static QTouchEvent::TouchPoint *findClosestTouchPoint(const QList<QTouchEvent::TouchPoint *> &activeTouchPoints,
-                                                          const QPointF &screenPos);
-    void appendTouchPoint(QTouchEvent::TouchPoint *touchPoint,
-                          QList<QTouchEvent::TouchPoint *> *currentTouchPoints);
-    void removeTouchPoint(QTouchEvent::TouchPoint *touchPoint,
-                          QList<QTouchEvent::TouchPoint *> *currentTouchPoints);
+    QTouchEvent::TouchPoint *findClosestTouchPoint(const QPointF &screenPos);
+    void appendTouchPoint(QTouchEvent::TouchPoint *touchPoint);
+    void removeTouchPoint(QTouchEvent::TouchPoint *touchPoint);
     bool translateTouchEvent(const MSG &msg);
 #endif