qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

QQuickTableView: sync viewport rect with syncView when rebuilding 

When moving contentX/Y, we also need to ensure that the viewport rect
reflects the change. Otherwise we'll end up loading rows and columns
somewhere else then under the viewport.

Change-Id: Ifbd3d66b9b3a822414aefde9b5bd088274dfa2ad
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
This commit is contained in:
Richard Moe Gustavsen 2019-05-06 19:42:49 +02:00
parent 005edd128a
commit dafdc9d701
2 changed files with 106 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/quick/items/qquicktableview.cpp
View File

@ -1644,10 +1644,15 @@ void QQuickTableViewPrivate::beginRebuildTable()
loadedTableInnerRect = QRect();
clearEdgeSizeCache();
if (syncHorizontally)
if (syncHorizontally) {
setLocalViewportX(syncView->contentX());
if (syncVertically)
viewportRect.moveLeft(syncView->d_func()->viewportRect.left());
}
if (syncVertically) {
setLocalViewportY(syncView->contentY());
viewportRect.moveTop(syncView->d_func()->viewportRect.top());
}
if (!model) {
qCDebug(lcTableViewDelegateLifecycle()) << "no model found, leaving table empty";

102
tests/auto/quick/qquicktableview/tst_qquicktableview.cpp
View File

@ -79,9 +79,10 @@ Q_DECLARE_METATYPE(QMarginsF);
QCOMPARE(loader->status(), QQuickLoader::Status::Ready); \
GET_QML_TABLEVIEW(tableView)
#define WAIT_UNTIL_POLISHED \
QVERIFY(QQuickTest::qIsPolishScheduled(tableView)); \
QVERIFY(QQuickTest::qWaitForItemPolished(tableView))
#define WAIT_UNTIL_POLISHED_ARG(item) \
QVERIFY(QQuickTest::qIsPolishScheduled(item)); \
QVERIFY(QQuickTest::qWaitForItemPolished(item))
#define WAIT_UNTIL_POLISHED WAIT_UNTIL_POLISHED_ARG(tableView)
class tst_QQuickTableView : public QQmlDataTest
{
@ -167,6 +168,8 @@ private slots:
void checkSyncView_childViews_data();
void checkSyncView_childViews();
void checkSyncView_differentSizedModels();
void checkSyncView_connect_late_data();
void checkSyncView_connect_late();
};
tst_QQuickTableView::tst_QQuickTableView()
@ -2391,6 +2394,99 @@ void tst_QQuickTableView::checkSyncView_differentSizedModels()
QVERIFY(tableViewHVPrivate->loadedColumns.isEmpty());
}
void tst_QQuickTableView::checkSyncView_connect_late_data()
{
QTest::addColumn<qreal>("flickToPos");
QTest::newRow("pos:110") << 110.;
QTest::newRow("pos:2010") << 2010.;
}
void tst_QQuickTableView::checkSyncView_connect_late()
{
// Check that if you assign a syncView to a TableView late, and
// after the views have been flicked around, they will still end up in sync.
QFETCH(qreal, flickToPos);
LOAD_TABLEVIEW("syncviewsimple.qml");
GET_QML_TABLEVIEW(tableViewH);
GET_QML_TABLEVIEW(tableViewV);
GET_QML_TABLEVIEW(tableViewHV);
QQuickTableView *views[] = {tableViewH, tableViewV, tableViewHV};
auto model = TestModelAsVariant(100, 100);
tableView->setModel(model);
// Start with no syncView connections
for (auto view : views) {
view->setSyncView(nullptr);
view->setModel(model);
}
WAIT_UNTIL_POLISHED;
tableView->setContentX(flickToPos);
tableView->setContentY(flickToPos);
WAIT_UNTIL_POLISHED;
// Check that viewport is not in sync after the flick
QCOMPARE(tableView->contentX(), flickToPos);
QCOMPARE(tableView->contentY(), flickToPos);
QCOMPARE(tableViewH->contentX(), 0);
QCOMPARE(tableViewH->contentY(), 0);
QCOMPARE(tableViewV->contentX(), 0);
QCOMPARE(tableViewV->contentY(), 0);
QCOMPARE(tableViewHV->contentX(), 0);
QCOMPARE(tableViewHV->contentY(), 0);
// Assign the syncView late. This should make
// all the views end up in sync.
for (auto view : views) {
view->setSyncView(tableView);
WAIT_UNTIL_POLISHED_ARG(view);
}
// Check that geometry properties are mirrored
QCOMPARE(tableViewH->columnSpacing(), tableView->columnSpacing());
QCOMPARE(tableViewH->rowSpacing(), 0);
QCOMPARE(tableViewH->contentWidth(), tableView->contentWidth());
QCOMPARE(tableViewV->columnSpacing(), 0);
QCOMPARE(tableViewV->rowSpacing(), tableView->rowSpacing());
QCOMPARE(tableViewV->contentHeight(), tableView->contentHeight());
// Check that viewport is in sync after the flick
QCOMPARE(tableView->contentX(), flickToPos);
QCOMPARE(tableView->contentY(), flickToPos);
QCOMPARE(tableViewH->contentX(), tableView->contentX());
QCOMPARE(tableViewH->contentY(), 0);
QCOMPARE(tableViewV->contentX(), 0);
QCOMPARE(tableViewV->contentY(), tableView->contentY());
QCOMPARE(tableViewHV->contentX(), tableView->contentX());
QCOMPARE(tableViewHV->contentY(), tableView->contentY());
// Check that topLeft cell is in sync after the flick
QCOMPARE(tableViewHPrivate->leftColumn(), tableViewPrivate->leftColumn());
QCOMPARE(tableViewHPrivate->rightColumn(), tableViewPrivate->rightColumn());
QCOMPARE(tableViewHPrivate->topRow(), 0);
QCOMPARE(tableViewVPrivate->leftColumn(), 0);
QCOMPARE(tableViewVPrivate->topRow(), tableViewPrivate->topRow());
QCOMPARE(tableViewHVPrivate->leftColumn(), tableViewPrivate->leftColumn());
QCOMPARE(tableViewHVPrivate->topRow(), tableViewPrivate->topRow());
// Check that the geometry of the tables are in sync after the flick
QCOMPARE(tableViewHPrivate->loadedTableOuterRect.left(), tableViewPrivate->loadedTableOuterRect.left());
QCOMPARE(tableViewHPrivate->loadedTableOuterRect.right(), tableViewPrivate->loadedTableOuterRect.right());
QCOMPARE(tableViewHPrivate->loadedTableOuterRect.top(), 0);
QCOMPARE(tableViewVPrivate->loadedTableOuterRect.top(), tableViewPrivate->loadedTableOuterRect.top());
QCOMPARE(tableViewVPrivate->loadedTableOuterRect.bottom(), tableViewPrivate->loadedTableOuterRect.bottom());
QCOMPARE(tableViewVPrivate->loadedTableOuterRect.left(), 0);
QCOMPARE(tableViewHVPrivate->loadedTableOuterRect, tableViewPrivate->loadedTableOuterRect);
}
QTEST_MAIN(tst_QQuickTableView)
#include "tst_qquicktableview.moc"