diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-09-16 22:22:24 +0200 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-09-24 23:09:23 +0200 |
| commit | 05dc0a387ae324f2d6f3d7e633a0a49473f6957a (patch) | |
| tree | 6bdfeaa2e700fdab6c5091993928fbf45419eb25 /tests | |
| parent | 8e3f40f8c62e94ef475f1c48d8f14df725b78a79 (diff) | |
Get rid of QMutableEventPoint::stationaryWithModifiedProperty
Omitting stationary points from touch events is such a marginal
optimization that this code probably isn't worth maintaining.
It wasn't implemented correctly this time either, according to the
tst_QQuickMultiPointTouchArea::stationaryTouchWithChangingPressure()
test.
Task-number: QTBUG-77142
Change-Id: I1ccc8ffe0451d6417add2b03c063ac1aebe36e8e
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/quick/qquickwindow/tst_qquickwindow.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp index dd95ab1808..43dfcdb8a4 100644 --- a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp +++ b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp @@ -705,10 +705,10 @@ void tst_qquickwindow::touchEvent_basic() touchSeq.stationary(0) .press(1, bottomItem->mapToScene(pos).toPoint(), window).commit(); QQuickTouchUtils::flush(window); - QCOMPARE(topItem->lastEvent.touchPoints.count(), 1); // received press only, not stationary + QCOMPARE(topItem->lastEvent.touchPoints.count(), 1); // received press and then stationary QVERIFY(middleItem->lastEvent.touchPoints.isEmpty()); QCOMPARE(bottomItem->lastEvent.touchPoints.count(), 1); - COMPARE_TOUCH_DATA(topItem->lastEvent, makeTouchData(QEvent::TouchBegin, window, QEventPoint::State::Pressed, makeTouchPoint(topItem, pos))); + COMPARE_TOUCH_DATA(topItem->lastEvent, makeTouchData(QEvent::TouchUpdate, window, QEventPoint::State::Stationary, makeTouchPoint(topItem, pos))); COMPARE_TOUCH_DATA(bottomItem->lastEvent, makeTouchData(QEvent::TouchBegin, window, QEventPoint::State::Pressed, makeTouchPoint(bottomItem, pos))); topItem->reset(); bottomItem->reset(); @@ -729,10 +729,10 @@ void tst_qquickwindow::touchEvent_basic() topItem->reset(); // release while another point is pressed - touchSeq.press(0, topItem->mapToScene(pos).toPoint(),window) - .press(1, bottomItem->mapToScene(pos).toPoint(), window).commit(); + touchSeq.press(0, topItem->mapToScene(pos).toPoint(),window) // seen and grabbed by topItem + .press(1, bottomItem->mapToScene(pos).toPoint(), window).commit(); // seen and grabbed by bottomItem QQuickTouchUtils::flush(window); - touchSeq.move(0, bottomItem->mapToScene(pos).toPoint(), window).commit(); + touchSeq.move(0, bottomItem->mapToScene(pos).toPoint(), window).stationary(1).commit(); QQuickTouchUtils::flush(window); touchSeq.release(0, bottomItem->mapToScene(pos).toPoint(), window) .stationary(1).commit(); @@ -745,7 +745,8 @@ void tst_qquickwindow::touchEvent_basic() // it's the last position that was actually different. COMPARE_TOUCH_DATA(topItem->lastEvent, makeTouchData(QEvent::TouchEnd, window, QEventPoint::State::Released, makeTouchPoint(topItem, topItem->mapFromItem(bottomItem, pos), pos))); - COMPARE_TOUCH_DATA(bottomItem->lastEvent, makeTouchData(QEvent::TouchBegin, window, QEventPoint::State::Pressed, makeTouchPoint(bottomItem, pos))); + COMPARE_TOUCH_DATA(bottomItem->lastEvent, makeTouchData(QEvent::TouchUpdate, window, QEventPoint::State::Stationary, + makeTouchPoint(bottomItem, pos))); topItem->reset(); bottomItem->reset(); |