whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow commiting and then reusing a QTouchEventSequence for testing. 

This method allows calls to stationary() to automatically remember
the previous position for a given touch point id. Example usage:

QTouchEventSequence sequence = QTest::touchEvent(&window);
sequence.press(0, QPoint(10,10)).commit();
sequence.stationary(0).press(1, QPoint(40,10)).commit();

Task-number: QTBUG-22057
Change-Id: I489ab3d61f4637d2ed97d09ed0854afa814407a1
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
bb10
Michael Brasser 2011-10-24 13:13:53 +10:00 committed by Qt by Nokia
parent f49bd47099
commit 7cef4b6463
1 changed files with 33 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/testlib/qtesttouch.h
View File

@ -77,7 +77,6 @@ namespace QTest
~QTouchEventSequence()
{
commit();
points.clear();
}
QTouchEventSequence& press(int touchId, const QPoint &pt, QWindow *window = 0)
{
@ -102,7 +101,7 @@ namespace QTest
}
QTouchEventSequence& stationary(int touchId)
{
QTouchEvent::TouchPoint &p = point(touchId);
QTouchEvent::TouchPoint &p = pointOrPreviousPoint(touchId);
p.setState(Qt::TouchPointStationary);
return *this;
}
@ -131,6 +130,25 @@ namespace QTest
}
#endif
void commit()
{
if (!points.isEmpty()) {
if (targetWindow)
{
QWindowSystemInterface::handleTouchEvent(targetWindow,QEvent::None,deviceType, touchPointList(points.values()));
QTest::qWait(10);
}
#ifdef QT_WIDGETS_LIB
else if (targetWidget)
{
qt_translateRawTouchEvent(targetWidget, deviceType, points.values());
}
#endif
}
previousPoints = points;
points.clear();
}
private:
#ifdef QT_WIDGETS_LIB
QTouchEventSequence(QWidget *widget, QTouchEvent::DeviceType aDeviceType)
@ -146,8 +164,6 @@ namespace QTest
targetWindow(window), deviceType(aDeviceType)
{
}
QTouchEventSequence(const QTouchEventSequence &v);
void operator=(const QTouchEventSequence&);
QTouchEvent::TouchPoint &point(int touchId)
{
@ -155,6 +171,18 @@ namespace QTest
points[touchId] = QTouchEvent::TouchPoint(touchId);
return points[touchId];
}
QTouchEvent::TouchPoint &pointOrPreviousPoint(int touchId)
{
if (!points.contains(touchId)) {
if (previousPoints.contains(touchId))
points[touchId] = previousPoints.value(touchId);
else
points[touchId] = QTouchEvent::TouchPoint(touchId);
}
return points[touchId];
}
#ifdef QT_WIDGETS_LIB
QPoint mapToScreen(QWidget *widget, const QPoint &pt)
{
@ -190,23 +218,8 @@ namespace QTest
}
return newList;
}
void commit()
{
if(targetWindow)
{
QWindowSystemInterface::handleTouchEvent(targetWindow,QEvent::None,deviceType, touchPointList(points.values()));
QTest::qWait(10);
targetWindow = 0;
}
#ifdef QT_WIDGETS_LIB
else if(targetWidget)
{
qt_translateRawTouchEvent(targetWidget, deviceType, points.values());
targetWidget = 0;
}
#endif
}
QMap<int, QTouchEvent::TouchPoint> previousPoints;
QMap<int, QTouchEvent::TouchPoint> points;
#ifdef QT_WIDGETS_LIB
QWidget *targetWidget;