diff options
| author | Morten Johan Sørvig <morten.sorvig@digia.com> | 2013-04-12 13:44:56 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-03 16:17:51 +0200 |
| commit | ee677dc8d85b36990d67e1be0e6e3187fd6b6a78 (patch) | |
| tree | 6a7eeefcd216563e6c707087f2ebd61e325f3cd3 /src/quick/items/qquickmultipointtoucharea_p.h | |
| parent | 885f325196de48493a604c6d13e3f360e4fefba3 (diff) | |
Enable touch events on Mac for MultiPointTouchArea
Enabling touch events on a window causes scroll event
lag so we want to avoid avoid it as far as possible.
Enable/disable on scene changes, similar to what we
do for WA_AcceptTouchEvents for widgets.
Task-number: QTBUG-28483
Change-Id: I2e5b5e2b093cccfc5253f7228f5ec0c588c60371
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Diffstat (limited to 'src/quick/items/qquickmultipointtoucharea_p.h')
| -rw-r--r-- | src/quick/items/qquickmultipointtoucharea_p.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/quick/items/qquickmultipointtoucharea_p.h b/src/quick/items/qquickmultipointtoucharea_p.h index e2ae5ed24e..afe7d4b77b 100644 --- a/src/quick/items/qquickmultipointtoucharea_p.h +++ b/src/quick/items/qquickmultipointtoucharea_p.h @@ -251,6 +251,9 @@ protected: void grabGesture(); virtual QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *); +protected slots: + void setTouchEventsEnabledForWindow(QWindow *window); + private: void ungrab(); QMap<int,QQuickTouchPoint*> _touchPrototypes; //TouchPoints defined in QML @@ -258,6 +261,7 @@ private: QList<QObject*> _releasedTouchPoints; QList<QObject*> _pressedTouchPoints; QList<QObject*> _movedTouchPoints; + QWindow *_currentWindow; int _minimumTouchPoints; int _maximumTouchPoints; bool _stealMouse; |