diff options
| author | Bea Lam <bea.lam@nokia.com> | 2011-09-23 11:40:25 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-03 01:38:02 +0200 |
| commit | 54da515e5e5f65e7ae253280038aad912780de12 (patch) | |
| tree | 183f92b4978b613db9fb139b87a8ad3d4019de3b /tests | |
| parent | 3176222ad06478b3aae752f59e14d63ffcd952c7 (diff) | |
Don't move content forwards when items are moved down
Previously, if items moved down within a view, the content position
would effectively drop down. E.g. for a (0,5,3) move that moved 3
items from 0 to 5, the content y would move to the position of index
3, since it became the new first item. However, this makes it
difficult to move transitions for move() operations in these cases
since these items do not move (since the content position moves
instead). With this fix, the content position does not move, and items
will always move if they are moved.
Note this behaviour was previously implemented for backwards
movements, e.g. a (5,0,3) move but was not enabled for a forwards
(0,5,3) move.
Change-Id: I1c5a19e3c36347a4aa0cf6e31c975967a7eeada9
Reviewed-on: http://codereview.qt-project.org/5576
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/declarative/qsggridview/tst_qsggridview.cpp | 9 | ||||
| -rw-r--r-- | tests/auto/declarative/qsglistview/tst_qsglistview.cpp | 11 |
2 files changed, 15 insertions, 5 deletions
diff --git a/tests/auto/declarative/qsggridview/tst_qsggridview.cpp b/tests/auto/declarative/qsggridview/tst_qsggridview.cpp index 6ec5378a1d..eab291f174 100644 --- a/tests/auto/declarative/qsggridview/tst_qsggridview.cpp +++ b/tests/auto/declarative/qsggridview/tst_qsggridview.cpp @@ -737,7 +737,12 @@ void tst_QSGGridView::moved_data() QTest::newRow("move multiple forwards, within visible items") << 0.0 << 0 << 5 << 3 - << 60.0; // moved 3 items (i.e. 1 row) down + << 0.0; + + QTest::newRow("move multiple forwards, before visible items") + << 120.0 // show 6-23 + << 3 << 4 << 3 // 3, 4, 5 move to after 6 + << 60.0; // row of 3,4,5 has moved down QTest::newRow("move multiple forwards, from non-visible -> visible") << 120.0 // show 6-23 @@ -757,7 +762,7 @@ void tst_QSGGridView::moved_data() QTest::newRow("move multiple forwards, from visible -> non-visible (move first item)") << 0.0 << 0 << 16 << 3 - << 60.0; + << 0.0; QTest::newRow("move multiple backwards, within visible items") diff --git a/tests/auto/declarative/qsglistview/tst_qsglistview.cpp b/tests/auto/declarative/qsglistview/tst_qsglistview.cpp index 9642b8f1be..c1be773bf2 100644 --- a/tests/auto/declarative/qsglistview/tst_qsglistview.cpp +++ b/tests/auto/declarative/qsglistview/tst_qsglistview.cpp @@ -981,7 +981,7 @@ void tst_QSGListView::moved_data() QTest::newRow("move 1 forwards, from visible -> non-visible (move first item)") << 0.0 << 0 << 16 << 1 - << 20.0; + << 0.0; QTest::newRow("move 1 backwards, within visible items") @@ -1018,7 +1018,12 @@ void tst_QSGListView::moved_data() QTest::newRow("move multiple forwards, within visible items") << 0.0 << 0 << 5 << 3 - << 20.0 * 3; + << 0.0; + + QTest::newRow("move multiple forwards, before visible items") + << 140.0 // show 7-22 + << 4 << 5 << 3 // 4,5,6 move to below 7 + << 20.0 * 3; // 4,5,6 moved down QTest::newRow("move multiple forwards, from non-visible -> visible") << 80.0 // show 4-19 @@ -1038,7 +1043,7 @@ void tst_QSGListView::moved_data() QTest::newRow("move multiple forwards, from visible -> non-visible (move first item)") << 0.0 << 0 << 16 << 3 - << 20.0 * 3; + << 0.0; QTest::newRow("move multiple backwards, within visible items") |