diff options
| author | Andrew den Exter <andrew.den.exter@jollamobile.com> | 2013-03-12 14:05:32 +1000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-19 02:20:05 +0100 |
| commit | ea8b11259ad68a8ff44708786ecf54e5a8a272d8 (patch) | |
| tree | e53b929afaa993b38052bcc505badff81c66ac9e /tests/auto/quick/qquickmousearea | |
| parent | fb8bc2ab5f834dc25bc6178776f67facaf76d698 (diff) | |
Fix jump and property changes on first move when dragging a Flickable.
Fixes a regression introduced by https://codereview.qt-project.org/48690
whereby on the first mouse move the contentItem was moved the total
distance from the touch point to where the drag distance was exceeded.
For large drag thresholds this causes a noticeable jump. Reverting the
dragStartOffset portion of that change fixes the regression.
That same change was also resposible for the property update regression
https://codereview.qt-project.org/49768 attempted to fix. That change
is also reverted as it was unnecessary and may have introduced some
regressions of its own.
Task-number: QTBUG-30032
Change-Id: I7723b459cc5a6a0731893aeb6332d00cad1bd79b
Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
Diffstat (limited to 'tests/auto/quick/qquickmousearea')
| -rw-r--r-- | tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp b/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp index a4bc92449b..055facc9e1 100644 --- a/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp +++ b/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp @@ -807,8 +807,8 @@ void tst_QQuickMouseArea::preventStealing() // Flickable content should have moved. - QCOMPARE(flickable->contentX(), 22.); - QCOMPARE(flickable->contentY(), 22.); + QCOMPARE(flickable->contentX(), 11.); + QCOMPARE(flickable->contentY(), 11.); QTest::mouseRelease(window, Qt::LeftButton, 0, QPoint(50, 50)); |