#include "../shared/viewtestutil.h"
#include "../shared/visualtestutil.h"
#include <QtGui/qguiapplication.h>
+#include "qplatformdefs.h"
Q_DECLARE_METATYPE(QQuickGridView::Flow)
Q_DECLARE_METATYPE(Qt::LayoutDirection)
private slots:
void init();
+ void cleanupTestCase();
void items();
void changed();
void inserted_basic();
void manualHighlight();
void footer();
void footer_data();
+ void initialZValues();
void header();
void header_data();
- void headerFooter();
- void headerFooter_data();
+ void extents();
+ void extents_data();
void resetModel_headerFooter();
void resizeViewAndRepaint();
void resizeGrid();
#endif
}
+void tst_QQuickGridView::cleanupTestCase()
+{
+#ifdef SHARE_VIEWS
+ testForView = QString();
+ delete m_view;
+ m_view = 0;
+#endif
+}
+
void tst_QQuickGridView::items()
{
- QQuickView *canvas = createView();
+ QQuickView *window = createView();
QaimModel model;
model.addItem("Fred", "12345");
model.addItem("Ben", "04321");
model.addItem("Jim", "0780");
- QQmlContext *ctxt = canvas->rootContext();
+ QQmlContext *ctxt = window->rootContext();
ctxt->setContextProperty("testModel", &model);
- canvas->setSource(testFileUrl("gridview1.qml"));
+ window->setSource(testFileUrl("gridview1.qml"));
qApp->processEvents();
- QQuickGridView *gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid");
+ QQuickGridView *gridview = findItem<QQuickGridView>(window->rootObject(), "grid");
QTRY_VERIFY(gridview != 0);
QQuickItem *contentItem = gridview->contentItem();
QTRY_VERIFY(contentItem != 0);
QTRY_COMPARE(gridview->count(), model.count());
- QTRY_COMPARE(canvas->rootObject()->property("count").toInt(), model.count());
+ QTRY_COMPARE(window->rootObject()->property("count").toInt(), model.count());
QTRY_COMPARE(contentItem->childItems().count(), model.count()+1); // assumes all are visible, +1 for the (default) highlight item
for (int i = 0; i < model.count(); ++i) {
int itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
QTRY_VERIFY(itemCount == 0);
- delete canvas;
+ delete window;
}
void tst_QQuickGridView::changed()
{
- QQuickView *canvas = createView();
+ QQuickView *window = createView();
QaimModel model;
model.addItem("Fred", "12345");
model.addItem("Ben", "04321");
model.addItem("Jim", "0780");
- QQmlContext *ctxt = canvas->rootContext();
+ QQmlContext *ctxt = window->rootContext();
ctxt->setContextProperty("testModel", &model);
- canvas->setSource(testFileUrl("gridview1.qml"));
+ window->setSource(testFileUrl("gridview1.qml"));
qApp->processEvents();
- QQuickFlickable *gridview = findItem<QQuickFlickable>(canvas->rootObject(), "grid");
+ QQuickFlickable *gridview = findItem<QQuickFlickable>(window->rootObject(), "grid");
QTRY_VERIFY(gridview != 0);
QQuickItem *contentItem = gridview->contentItem();
QTRY_VERIFY(number != 0);
QTRY_COMPARE(number->text(), model.number(1));
- delete canvas;
+ delete window;
}
void tst_QQuickGridView::inserted_basic()
{
- QQuickView *canvas = createView();
- canvas->show();
+ QQuickView *window = createView();
+ window->show();
QaimModel model;
model.addItem("Fred", "12345");
model.addItem("John", "2345");
model.addItem("Bob", "54321");
- canvas->rootContext()->setContextProperty("testModel", &model);
- canvas->setSource(testFileUrl("gridview1.qml"));
+ window->rootContext()->setContextProperty("testModel", &model);
+ window->setSource(testFileUrl("gridview1.qml"));
qApp->processEvents();
- QQuickGridView *gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid");
+ QQuickGridView *gridview = findItem<QQuickGridView>(window->rootObject(), "grid");
QTRY_VERIFY(gridview != 0);
QQuickItem *contentItem = gridview->contentItem();
model.insertItem(1, "Will", "9876");
- QTRY_COMPARE(canvas->rootObject()->property("count").toInt(), model.count());
+ QTRY_COMPARE(window->rootObject()->property("count").toInt(), model.count());
QTRY_COMPARE(contentItem->childItems().count(), model.count()+1); // assumes all are visible, +1 for the (default) highlight item
QQuickText *name = findItem<QQuickText>(contentItem, "textName", 1);
QTRY_COMPARE(number->text(), model.number(1));
// Checks that onAdd is called
- int added = canvas->rootObject()->property("added").toInt();
+ int added = window->rootObject()->property("added").toInt();
QTRY_COMPARE(added, 1);
// Confirm items positioned correctly
QTRY_VERIFY(gridview->contentY() == 120);
- delete canvas;
+ delete window;
}
void tst_QQuickGridView::inserted_defaultLayout(QQuickGridView::Flow flow,
for (int i = 0; i < 30; i++)
model.addItem("Item" + QString::number(i), "");
- QQuickView *canvas = getView();
- QQmlContext *ctxt = canvas->rootContext();
+ QQuickView *window = getView();
+ QQmlContext *ctxt = window->rootContext();
ctxt->setContextProperty("testModel", &model);
ctxt->setContextProperty("testTopToBottom", flow == QQuickGridView::FlowTopToBottom);
ctxt->setContextProperty("testRightToLeft", horizLayout == Qt::RightToLeft);
ctxt->setContextProperty("testBottomToTop", verticalLayout == QQuickGridView::BottomToTop);
- canvas->setSource(testFileUrl("layouts.qml"));
- canvas->show();
+ window->setSource(testFileUrl("layouts.qml"));
+ window->show();
qApp->processEvents();
- QQuickGridView *gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid");
+ QQuickGridView *gridview = findItem<QQuickGridView>(window->rootObject(), "grid");
QTRY_VERIFY(gridview != 0);
QQuickItem *contentItem = gridview->contentItem();
QTRY_VERIFY(contentItem != 0);
int firstVisibleIndex = -1;
for (int i=0; i<items.count(); i++) {
QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
- if (item && item->isVisible()) {
+ if (item && delegateVisible(item)) {
firstVisibleIndex = i;
break;
}
QCOMPARE(name->text(), model.name(i));
}
- releaseView(canvas);
+ releaseView(window);
}
void tst_QQuickGridView::inserted_defaultLayout_data()
QFETCH(int, cacheBuffer);
QQuickText *name;
- QQuickView *canvas = getView();
+ QQuickView *window = getView();
QaimModel model;
for (int i = 0; i < 30; i++)
model.addItem("Item" + QString::number(i), "");
- QQmlContext *ctxt = canvas->rootContext();
+ QQmlContext *ctxt = window->rootContext();
ctxt->setContextProperty("testModel", &model);
- canvas->setSource(testFileUrl("gridview1.qml"));
- canvas->show();
+ window->setSource(testFileUrl("gridview1.qml"));
+ window->show();
qApp->processEvents();
- QQuickGridView *gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid");
+ QQuickGridView *gridview = findItem<QQuickGridView>(window->rootObject(), "grid");
QTRY_VERIFY(gridview != 0);
QQuickItem *contentItem = gridview->contentItem();
QTRY_VERIFY(contentItem != 0);
QTRY_COMPARE(name->text(), model.name(i));
}
- releaseView(canvas);
+ releaseView(window);
}
void tst_QQuickGridView::insertBeforeVisible_data()
void tst_QQuickGridView::removed_basic()
{
- QQuickView *canvas = createView();
- canvas->show();
+ QQuickView *window = createView();
+ window->show();
QaimModel model;
for (int i = 0; i < 40; i++)
model.addItem("Item" + QString::number(i), "");
- canvas->rootContext()->setContextProperty("testModel", &model);
- canvas->setSource(testFileUrl("gridview1.qml"));
+ window->rootContext()->setContextProperty("testModel", &model);
+ window->setSource(testFileUrl("gridview1.qml"));
qApp->processEvents();
- QQuickGridView *gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid");
+ QQuickGridView *gridview = findItem<QQuickGridView>(window->rootObject(), "grid");
QTRY_VERIFY(gridview != 0);
QQuickItem *contentItem = gridview->contentItem();
QTRY_VERIFY(contentItem != 0);
QTRY_COMPARE(QQuickItemPrivate::get(gridview)->polishScheduled, false);
model.removeItem(1);
- QTRY_COMPARE(canvas->rootObject()->property("count").toInt(), model.count());
+ QTRY_COMPARE(window->rootObject()->property("count").toInt(), model.count());
QQuickText *name = findItem<QQuickText>(contentItem, "textName", 1);
QTRY_VERIFY(name != 0);
// Checks that onRemove is called
- QString removed = canvas->rootObject()->property("removed").toString();
+ QString removed = window->rootObject()->property("removed").toString();
QTRY_COMPARE(removed, QString("Item1"));
// Confirm items positioned correctly
// Remove first item (which is the current item);
model.removeItem(0);
- QTRY_COMPARE(canvas->rootObject()->property("count").toInt(), model.count());
+ QTRY_COMPARE(window->rootObject()->property("count").toInt(), model.count());
name = findItem<QQuickText>(contentItem, "textName", 0);
QTRY_VERIFY(name != 0);
// Remove items not visible
model.removeItem(25);
- QTRY_COMPARE(canvas->rootObject()->property("count").toInt(), model.count());
+ QTRY_COMPARE(window->rootObject()->property("count").toInt(), model.count());
// Confirm items positioned correctly
itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
QTRY_COMPARE(gridview->contentY(), 120.0);
model.removeItem(1);
- QTRY_COMPARE(canvas->rootObject()->property("count").toInt(), model.count());
+ QTRY_COMPARE(window->rootObject()->property("count").toInt(), model.count());
// Confirm items positioned correctly
for (int i = 6; i < 18; ++i) {
// Remove currentIndex
QQuickItem *oldCurrent = gridview->currentItem();
model.removeItem(9);
- QTRY_COMPARE(canvas->rootObject()->property("count").toInt(), model.count());
+ QTRY_COMPARE(window->rootObject()->property("count").toInt(), model.count());
QTRY_COMPARE(gridview->currentIndex(), 9);
QTRY_VERIFY(gridview->currentItem() != oldCurrent);
QTRY_COMPARE(gridview->currentIndex(), 7);
QTRY_VERIFY(gridview->currentItem() == oldCurrent);
- delete canvas;
+ delete window;
}
void tst_QQuickGridView::removed_defaultLayout(QQuickGridView::Flow flow,
QFETCH(QString, firstVisible);
QFETCH(QString, firstVisible_ttb);
- QQuickView *canvas = getView();
+ QQuickView *window = getView();
QaimModel model;
for (int i = 0; i < 30; i++)
model.addItem("Item" + QString::number(i), "");
- QQmlContext *ctxt = canvas->rootContext();
+ QQmlContext *ctxt = window->rootContext();
ctxt->setContextProperty("testModel", &model);
ctxt->setContextProperty("testTopToBottom", flow == QQuickGridView::FlowTopToBottom);
ctxt->setContextProperty("testRightToLeft", horizLayout == Qt::RightToLeft);
ctxt->setContextProperty("testBottomToTop", verticalLayout == QQuickGridView::BottomToTop);
- canvas->setSource(testFileUrl("layouts.qml"));
- canvas->show();
+ window->setSource(testFileUrl("layouts.qml"));
+ window->show();
qApp->processEvents();
- QQuickGridView *gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid");
+ QQuickGridView *gridview = findItem<QQuickGridView>(window->rootObject(), "grid");
QTRY_VERIFY(gridview != 0);
QQuickItem *contentItem = gridview->contentItem();
QTRY_VERIFY(contentItem != 0);
QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
if (item) {
QRectF itemRect(item->x(), item->y(), item->width(), item->height());
- if (item->isVisible() && viewRect.intersects(itemRect)) {
+ if (delegateVisible(item) && viewRect.intersects(itemRect)) {
firstVisibleIndex = i;
QQmlExpression en(qmlContext(item), item, "name");
firstName = en.evaluate().toString();
QTRY_COMPARE(name->text(), model.name(i));
}
- releaseView(canvas);
+ releaseView(window);
}
void tst_QQuickGridView::removed_defaultLayout_data()
QFETCH(bool, doAdd);
QFETCH(qreal, newTopContentY);
- QQuickView *canvas = getView();
- canvas->show();
+ QQuickView *window = getView();
+ window->show();
QaimModel model;
for (int i = 0; i < 30; i++)
model.addItem("Item" + QString::number(i), "");
- canvas->rootContext()->setContextProperty("testModel", &model);
- canvas->setSource(testFileUrl("gridview1.qml"));
+ window->rootContext()->setContextProperty("testModel", &model);
+ window->setSource(testFileUrl("gridview1.qml"));
- QQuickGridView *gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid");
+ QQuickGridView *gridview = findItem<QQuickGridView>(window->rootObject(), "grid");
QTRY_VERIFY(gridview != 0);
QQuickItem *contentItem = gridview->contentItem();
QTRY_VERIFY(contentItem != 0);
QTRY_VERIFY(item->y() == (i/3)*60 + newTopContentY);
}
- releaseView(canvas);
+ releaseView(window);
}
void tst_QQuickGridView::addOrRemoveBeforeVisible_data()
void tst_QQuickGridView::clear()
{
- QQuickView *canvas = createView();
+ QQuickView *window = createView();
QaimModel model;
for (int i = 0; i < 30; i++)
model.addItem("Item" + QString::number(i), "");
- canvas->rootContext()->setContextProperty("testModel", &model);
- canvas->setSource(testFileUrl("gridview1.qml"));
- canvas->show();
+ window->rootContext()->setContextProperty("testModel", &model);
+ window->setSource(testFileUrl("gridview1.qml"));
+ window->show();
qApp->processEvents();
- QQuickGridView *gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid");
+ QQuickGridView *gridview = findItem<QQuickGridView>(window->rootObject(), "grid");
QVERIFY(gridview != 0);
QQuickItem *contentItem = gridview->contentItem();
QVERIFY(contentItem != 0);
QVERIFY(gridview->currentItem() == 0);
QVERIFY(gridview->contentY() == 0);
QVERIFY(gridview->currentIndex() == -1);
+ QCOMPARE(gridview->contentHeight(), 0.0);
// confirm sanity when adding an item to cleared list
model.addItem("New", "1");
QVERIFY(gridview->currentItem() != 0);
QVERIFY(gridview->currentIndex() == 0);
- delete canvas;
+ delete window;
}
void tst_QQuickGridView::moved_defaultLayout(QQuickGridView::Flow flow,
QFETCH(int, count_ttb);
QFETCH(qreal, rowOffsetAfterMove);
- QQuickView *canvas = getView();
+ QQuickView *window = getView();
QaimModel model;
for (int i = 0; i < 30; i++)
model.addItem("Item" + QString::number(i), "");
- QQmlContext *ctxt = canvas->rootContext();
+ QQmlContext *ctxt = window->rootContext();
ctxt->setContextProperty("testModel", &model);
ctxt->setContextProperty("testTopToBottom", flow == QQuickGridView::FlowTopToBottom);
ctxt->setContextProperty("testRightToLeft", horizLayout == Qt::RightToLeft);
ctxt->setContextProperty("testBottomToTop", verticalLayout == QQuickGridView::BottomToTop);
- canvas->setSource(testFileUrl("layouts.qml"));
- canvas->show();
+ window->setSource(testFileUrl("layouts.qml"));
+ window->show();
qApp->processEvents();
- QQuickGridView *gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid");
+ QQuickGridView *gridview = findItem<QQuickGridView>(window->rootObject(), "grid");
QTRY_VERIFY(gridview != 0);
QQuickItem *contentItem = gridview->contentItem();
QTRY_VERIFY(contentItem != 0);
int firstVisibleIndex = -1;
for (int i=0; i<items.count(); i++) {
QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
- if (item && item->isVisible()) {
+ if (item && delegateVisible(item)) {
firstVisibleIndex = i;
break;
}
for (int i = firstVisibleIndex; i < model.count() && i < items.count(); ++i) {
QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
if (!item &&
- ( (flow == QQuickGridView::FlowLeftToRight && i >= firstVisibleIndex + (3*6))
- || flow == QQuickGridView::FlowTopToBottom && i >= firstVisibleIndex + (5*3) ) ) {
+ ( (flow == QQuickGridView::FlowLeftToRight && i >= firstVisibleIndex + (3*6))
+ || (flow == QQuickGridView::FlowTopToBottom && i >= firstVisibleIndex + (5*3)) ) ) {
continue; // index has moved out of view
}
QVERIFY2(item, QTest::toString(QString("Item %1 not found").arg(i)));
QTRY_COMPARE(gridview->currentIndex(), i);
}
- releaseView(canvas);
+ releaseView(window);
}
void tst_QQuickGridView::moved_defaultLayout_data()
QFETCH(int, newCount);
QFETCH(int, newCurrentIndex);
- QQuickView *canvas = getView();
+ QQuickView *window = getView();
QaimModel model;
for (int i = 0; i < startCount; i++)
model.addItem("Item" + QString::number(i), "");
- canvas->rootContext()->setContextProperty("testModel", &model);
- canvas->setSource(testFileUrl("gridview1.qml"));
- canvas->show();
+ window->rootContext()->setContextProperty("testModel", &model);
+ window->setSource(testFileUrl("gridview1.qml"));
+ window->show();
qApp->processEvents();
- QQuickGridView *gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid");
+ QQuickGridView *gridview = findItem<QQuickGridView>(window->rootObject(), "grid");
QTRY_VERIFY(gridview != 0);
QTRY_COMPARE(QQuickItemPrivate::get(gridview)->polishScheduled, false);
case ListChange::SetContentY:
gridview->setContentY(changes[i].pos);
break;
+ case ListChange::Polish:
+ break;
}
if (condensed) {
QTRY_COMPARE(QQuickItemPrivate::get(gridview)->polishScheduled, false);
QTRY_COMPARE(number->text(), model.number(i));
}
- releaseView(canvas);
+ releaseView(window);
}
void tst_QQuickGridView::multipleChanges_data()
void tst_QQuickGridView::swapWithFirstItem()
{
// QTBUG_9697
- QQuickView *canvas = createView();
+ QQuickView *window = createView();
QaimModel model;
for (int i = 0; i < 30; i++)
model.addItem("Item" + QString::number(i), "");
- canvas->rootContext()->setContextProperty("testModel", &model);
- canvas->setSource(testFileUrl("gridview1.qml"));
- canvas->show();
+ window->rootContext()->setContextProperty("testModel", &model);
+ window->setSource(testFileUrl("gridview1.qml"));
+ window->show();
qApp->processEvents();
- QQuickGridView *gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid");
+ QQuickGridView *gridview = findItem<QQuickGridView>(window->rootObject(), "grid");
QTRY_VERIFY(gridview != 0);
// ensure content position is stable
model.moveItem(10, 0);
QTRY_VERIFY(gridview->contentY() == 0);
- delete canvas;
+ delete window;
}
void tst_QQuickGridView::currentIndex()
for (int i = 0; i < 60; i++)
model.addItem("Item" + QString::number(i), QString::number(i));
- QQuickView *canvas = new QQuickView(0);
- canvas->setGeometry(0,0,240,320);
- canvas->show();
+ QQuickView *window = new QQuickView(0);
+ window->setGeometry(0,0,240,320);
+ window->show();
- QQmlContext *ctxt = canvas->rootContext();
+ QQmlContext *ctxt = window->rootContext();
ctxt->setContextProperty("testModel", &model);
QString filename(testFile("gridview-initCurrent.qml"));
- canvas->setSource(QUrl::fromLocalFile(filename));
+ window->setSource(QUrl::fromLocalFile(filename));
qApp->processEvents();
- QQuickGridView *gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid");
+ QQuickGridView *gridview = findItem<QQuickGridView>(window->rootObject(), "grid");
QVERIFY(gridview != 0);
QTRY_VERIFY(!QQuickItemPrivate::get(gridview)->polishScheduled);
QTRY_VERIFY(gridview->verticalVelocity() != 0.0);
// footer should become visible if it is out of view, and then current index moves to the first row
- canvas->rootObject()->setProperty("showFooter", true);
+ window->rootObject()->setProperty("showFooter", true);
QTRY_VERIFY(gridview->footerItem());
gridview->setCurrentIndex(model.count()-3);
QTRY_VERIFY(gridview->footerItem()->y() > gridview->contentY() + gridview->height());
gridview->setCurrentIndex(model.count()-2);
QTRY_COMPARE(gridview->contentY() + gridview->height(), (60.0 * model.count()/3) + gridview->footerItem()->height());
- canvas->rootObject()->setProperty("showFooter", false);
+ window->rootObject()->setProperty("showFooter", false);
// header should become visible if it is out of view, and then current index moves to the last row
- canvas->rootObject()->setProperty("showHeader", true);
+ window->rootObject()->setProperty("showHeader", true);
QTRY_VERIFY(gridview->headerItem());
gridview->setCurrentIndex(3);
QTRY_VERIFY(gridview->headerItem()->y() + gridview->headerItem()->height() < gridview->contentY());
gridview->setCurrentIndex(1);
QTRY_COMPARE(gridview->contentY(), -gridview->headerItem()->height());
- canvas->rootObject()->setProperty("showHeader", false);
+ window->rootObject()->setProperty("showHeader", false);
// turn off auto highlight
gridview->setHighlightFollowsCurrentItem(false);
// insert item before currentIndex
gridview->setCurrentIndex(28);
model.insertItem(0, "Foo", "1111");
- QTRY_COMPARE(canvas->rootObject()->property("current").toInt(), 29);
+ QTRY_COMPARE(window->rootObject()->property("current").toInt(), 29);
// check removing highlight by setting currentIndex to -1;
gridview->setCurrentIndex(-1);
// moving currentItem out of view should make it invisible
gridview->setCurrentIndex(0);
- QTRY_VERIFY(gridview->currentItem()->isVisible());
+ QTRY_VERIFY(delegateVisible(gridview->currentItem()));
gridview->setContentY(200);
- QTRY_VERIFY(!gridview->currentItem()->isVisible());
+ QTRY_VERIFY(!delegateVisible(gridview->currentItem()));
- delete canvas;
+ delete window;
}
void tst_QQuickGridView::noCurrentIndex()
for (int i = 0; i < 60; i++)
model.addItem("Item" + QString::number(i), QString::number(i));
- QQuickView *canvas = new QQuickView(0);
- canvas->setGeometry(0,0,240,320);
+ QQuickView *window = new QQuickView(0);
+ window->setGeometry(0,0,240,320);
- QQmlContext *ctxt = canvas->rootContext();
+ QQmlContext *ctxt = window->rootContext();
ctxt->setContextProperty("testModel", &model);
QString filename(testFile("gridview-noCurrent.qml"));
- canvas->setSource(QUrl::fromLocalFile(filename));
- canvas->show();
+ window->setSource(QUrl::fromLocalFile(filename));
+ window->show();
qApp->processEvents();
- QQuickGridView *gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid");
+ QQuickGridView *gridview = findItem<QQuickGridView>(window->rootObject(), "grid");
QVERIFY(gridview != 0);
QQuickItem *contentItem = gridview->contentItem();
QVERIFY(contentItem != 0);
QVERIFY(gridview->currentItem());
QVERIFY(gridview->highlightItem());
- delete canvas;
+ delete window;
}
void tst_QQuickGridView::keyNavigation()
for (int i = 0; i < 18; i++)
model.addItem("Item" + QString::number(i), "");
- QQuickView *canvas = getView();
- canvas->rootContext()->setContextProperty("testModel", &model);
- canvas->setSource(testFileUrl("gridview1.qml"));
- canvas->show();
- qApp->processEvents();
+ QQuickView *window = getView();
+ window->rootContext()->setContextProperty("testModel", &model);
+ window->setSource(testFileUrl("gridview1.qml"));
+ window->show();
+ QTest::qWaitForWindowActive(window);
- QQuickGridView *gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid");
+ QQuickGridView *gridview = findItem<QQuickGridView>(window->rootObject(), "grid");
QTRY_VERIFY(gridview != 0);
gridview->setFlow(flow);
gridview->setLayoutDirection(layoutDirection);
gridview->setVerticalLayoutDirection(verticalLayoutDirection);
QTRY_COMPARE(QQuickItemPrivate::get(gridview)->polishScheduled, false);
- canvas->requestActivateWindow();
- QTRY_VERIFY(qGuiApp->focusWindow() == canvas);
+ window->requestActivateWindow();
+ QTest::qWaitForWindowActive(window);
+ QTRY_VERIFY(qGuiApp->focusWindow() == window);
QCOMPARE(gridview->currentIndex(), 0);
- QTest::keyClick(canvas, forwardsKey);
+ QTest::keyClick(window, forwardsKey);
QCOMPARE(gridview->currentIndex(), 1);
- QTest::keyClick(canvas, backwardsKey);
+ QTest::keyClick(window, backwardsKey);
QCOMPARE(gridview->currentIndex(), 0);
gridview->setCurrentIndex(7);
QCOMPARE(gridview->currentIndex(), indexDownFrom7);
gridview->setCurrentIndex(7);
- QTest::keyClick(canvas, Qt::Key_Right);
+ QTest::keyClick(window, Qt::Key_Right);
QCOMPARE(gridview->currentIndex(), indexRightOf7);
- QTest::keyClick(canvas, Qt::Key_Left);
+ QTest::keyClick(window, Qt::Key_Left);
QCOMPARE(gridview->currentIndex(), 7);
- QTest::keyClick(canvas, Qt::Key_Left);
+ QTest::keyClick(window, Qt::Key_Left);
QCOMPARE(gridview->currentIndex(), indexLeftOf7);
- QTest::keyClick(canvas, Qt::Key_Right);
+ QTest::keyClick(window, Qt::Key_Right);
QCOMPARE(gridview->currentIndex(), 7);
- QTest::keyClick(canvas, Qt::Key_Up);
+ QTest::keyClick(window, Qt::Key_Up);
QCOMPARE(gridview->currentIndex(), indexUpFrom7);
- QTest::keyClick(canvas, Qt::Key_Down);
+ QTest::keyClick(window, Qt::Key_Down);
QCOMPARE(gridview->currentIndex(), 7);
- QTest::keyClick(canvas, Qt::Key_Down);
+ QTest::keyClick(window, Qt::Key_Down);
QCOMPARE(gridview->currentIndex(), indexDownFrom7);
// hold down a key to go forwards
gridview->setCurrentIndex(0);
for (int i=0; i<model.count()-1; i++) {
// QTest::qWait(500);
- QTest::simulateEvent(canvas, true, forwardsKey, Qt::NoModifier, "", true);
+ QTest::simulateEvent(window, true, forwardsKey, Qt::NoModifier, "", true);
QTRY_COMPARE(gridview->currentIndex(), i+1);
}
- QTest::keyRelease(canvas, forwardsKey);
+ QTest::keyRelease(window, forwardsKey);
QTRY_COMPARE(gridview->currentIndex(), model.count()-1);
QTRY_COMPARE(gridview->contentX(), contentPosAtLastItem.x());
QTRY_COMPARE(gridview->contentY(), contentPosAtLastItem.y());
// hold down a key to go backwards
for (int i=model.count()-1; i > 0; i--) {
- QTest::simulateEvent(canvas, true, backwardsKey, Qt::NoModifier, "", true);
+ QTest::simulateEvent(window, true, backwardsKey, Qt::NoModifier, "", true);
QTRY_COMPARE(gridview->currentIndex(), i-1);
}
- QTest::keyRelease(canvas, backwardsKey);
+ QTest::keyRelease(window, backwardsKey);
QTRY_COMPARE(gridview->currentIndex(), 0);
QTRY_COMPARE(gridview->contentX(), contentPosAtFirstItem.x());
QTRY_COMPARE(gridview->contentY(), contentPosAtFirstItem.y());
// no wrap
QVERIFY(!gridview->isWrapEnabled());
- QTest::keyClick(canvas, forwardsKey);
+ QTest::keyClick(window, forwardsKey);
QCOMPARE(gridview->currentIndex(), 1);
- QTest::keyClick(canvas, backwardsKey);
+ QTest::keyClick(window, backwardsKey);
QCOMPARE(gridview->currentIndex(), 0);
- QTest::keyClick(canvas, backwardsKey);
+ QTest::keyClick(window, backwardsKey);
QCOMPARE(gridview->currentIndex(), 0);
// with wrap
gridview->setWrapEnabled(true);
QVERIFY(gridview->isWrapEnabled());
- QTest::keyClick(canvas, backwardsKey);
+ QTest::keyClick(window, backwardsKey);
QCOMPARE(gridview->currentIndex(), model.count()-1);
QTRY_COMPARE(gridview->contentX(), contentPosAtLastItem.x());
QTRY_COMPARE(gridview->contentY(), contentPosAtLastItem.y());
- QTest::keyClick(canvas, forwardsKey);
+ QTest::keyClick(window, forwardsKey);
QCOMPARE(gridview->currentIndex(), 0);
QTRY_COMPARE(gridview->contentX(), contentPosAtFirstItem.x());
QTRY_COMPARE(gridview->contentY(), contentPosAtFirstItem.y());
- releaseView(canvas);
+ // Test key press still accepted when position wraps to same index.
+ window->rootObject()->setProperty("lastKey", 0);
+ model.removeItems(1, model.count() - 1);
+
+ QTest::keyClick(window, backwardsKey);
+ QCOMPARE(window->rootObject()->property("lastKey").toInt(), 0);
+
+ QTest::keyClick(window, forwardsKey);
+ QCOMPARE(window->rootObject()->property("lastKey").toInt(), 0);
+
+ // Test key press not accepted at limits when wrap is disabled.
+ gridview->setWrapEnabled(false);
+
+ QTest::keyClick(window, backwardsKey);
+ QCOMPARE(window->rootObject()->property("lastKey").toInt(), int(backwardsKey));
+
+ QTest::keyClick(window, forwardsKey);
+ QCOMPARE(window->rootObject()->property("lastKey").toInt(), int(forwardsKey));
+
+ releaseView(window);
}
void tst_QQuickGridView::keyNavigation_data()
void tst_QQuickGridView::changeFlow()
{
- QQuickView *canvas = createView();
+ QQuickView *window = createView();
QaimModel model;
for (int i = 0; i < 30; i++)
model.addItem("Item" + QString::number(i), QString::number(i));
- QQmlContext *ctxt = canvas->rootContext();
+ QQmlContext *ctxt = window->rootContext();
ctxt->setContextProperty("testModel", &model);
ctxt->setContextProperty("testRightToLeft", QVariant(false));
ctxt->setContextProperty("testTopToBottom", QVariant(false));
ctxt->setContextProperty("testBottomToTop", QVariant(false));
- canvas->setSource(testFileUrl("layouts.qml"));
+ window->setSource(testFileUrl("layouts.qml"));
qApp->processEvents();
- QQuickGridView *gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid");
+ QQuickGridView *gridview = findItem<QQuickGridView>(window->rootObject(), "grid");
QTRY_VERIFY(gridview != 0);
QQuickItem *contentItem = gridview->contentItem();
QTRY_COMPARE(number->text(), model.number(i));
}
- delete canvas;
+ delete window;
}
void tst_QQuickGridView::defaultValues()
QTRY_COMPARE(obj->highlightFollowsCurrentItem(), true);
QTRY_VERIFY(obj->flow() == 0);
QTRY_COMPARE(obj->isWrapEnabled(), false);
- QTRY_COMPARE(obj->cacheBuffer(), 0);
+#ifdef QML_VIEW_DEFAULTCACHEBUFFER
+ QTRY_COMPARE(obj->cacheBuffer(), QML_VIEW_DEFAULTCACHEBUFFER);
+#else
+ QTRY_COMPARE(obj->cacheBuffer(), 320);
+#endif
QTRY_COMPARE(obj->cellWidth(), qreal(100)); //### Should 100 be the default?
QTRY_COMPARE(obj->cellHeight(), qreal(100));
delete obj;
void tst_QQuickGridView::propertyChanges()
{
- QQuickView *canvas = createView();
- QTRY_VERIFY(canvas);
- canvas->setSource(testFileUrl("propertychangestest.qml"));
+ QQuickView *window = createView();
+ QTRY_VERIFY(window);
+ window->setSource(testFileUrl("propertychangestest.qml"));
- QQuickGridView *gridView = canvas->rootObject()->findChild<QQuickGridView*>("gridView");
+ QQuickGridView *gridView = window->rootObject()->findChild<QQuickGridView*>("gridView");
QTRY_VERIFY(gridView);
QSignalSpy keyNavigationWrapsSpy(gridView, SIGNAL(keyNavigationWrapsChanged()));
gridView->setFlow(QQuickGridView::FlowTopToBottom);
QTRY_COMPARE(flowSpy.count(),3);
- delete canvas;
+ delete window;
}
void tst_QQuickGridView::componentChanges()
{
- QQuickView *canvas = createView();
- QTRY_VERIFY(canvas);
- canvas->setSource(testFileUrl("propertychangestest.qml"));
+ QQuickView *window = createView();
+ QTRY_VERIFY(window);
+ window->setSource(testFileUrl("propertychangestest.qml"));
- QQuickGridView *gridView = canvas->rootObject()->findChild<QQuickGridView*>("gridView");
+ QQuickGridView *gridView = window->rootObject()->findChild<QQuickGridView*>("gridView");
QTRY_VERIFY(gridView);
- QQmlComponent component(canvas->engine());
+ QQmlComponent component(window->engine());
component.setData("import QtQuick 2.0; Rectangle { color: \"blue\"; }", QUrl::fromLocalFile(""));
- QQmlComponent delegateComponent(canvas->engine());
+ QQmlComponent delegateComponent(window->engine());
delegateComponent.setData("import QtQuick 2.0; Text { text: '<b>Name:</b> ' + name }", QUrl::fromLocalFile(""));
QSignalSpy highlightSpy(gridView, SIGNAL(highlightChanged()));
QTRY_COMPARE(headerItemSpy.count(),1);
QTRY_COMPARE(footerItemSpy.count(),1);
- delete canvas;
+ delete window;
}
void tst_QQuickGridView::modelChanges()
{
- QQuickView *canvas = createView();
- QTRY_VERIFY(canvas);
- canvas->setSource(testFileUrl("propertychangestest.qml"));
+ QQuickView *window = createView();
+ QTRY_VERIFY(window);
+ window->setSource(testFileUrl("propertychangestest.qml"));
- QQuickGridView *gridView = canvas->rootObject()->findChild<QQuickGridView*>("gridView");
+ QQuickGridView *gridView = window->rootObject()->findChild<QQuickGridView*>("gridView");
QTRY_VERIFY(gridView);
- QQuickListModel *alternateModel = canvas->rootObject()->findChild<QQuickListModel*>("alternateModel");
+ QQuickListModel *alternateModel = window->rootObject()->findChild<QQuickListModel*>("alternateModel");
QTRY_VERIFY(alternateModel);
QVariant modelVariant = QVariant::fromValue<QObject *>(alternateModel);
QSignalSpy modelSpy(gridView, SIGNAL(modelChanged()));
gridView->setModel(QVariant());
QTRY_COMPARE(modelSpy.count(),2);
- delete canvas;
+ delete window;
}
void tst_QQuickGridView::positionViewAtIndex()
{
- QQuickView *canvas = createView();
+ QQuickView *window = createView();
QaimModel model;
for (int i = 0; i < 40; i++)
model.addItem("Item" + QString::number(i), "");
- QQmlContext *ctxt = canvas->rootContext();
+ QQmlContext *ctxt = window->rootContext();
ctxt->setContextProperty("testModel", &model);
ctxt->setContextProperty("testRightToLeft", QVariant(false));
ctxt->setContextProperty("testTopToBottom", QVariant(false));
ctxt->setContextProperty("testBottomToTop", QVariant(false));
- canvas->setSource(testFileUrl("layouts.qml"));
- canvas->show();
+ window->setSource(testFileUrl("layouts.qml"));
+ window->show();
qApp->processEvents();
- QQuickGridView *gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid");
+ QQuickGridView *gridview = findItem<QQuickGridView>(window->rootObject(), "grid");
QTRY_VERIFY(gridview != 0);
QQuickItem *contentItem = gridview->contentItem();
QTRY_VERIFY(contentItem != 0);
QTRY_COMPARE(gridview->contentX(), 0.);
gridview->setContentX(80);
- canvas->rootObject()->setProperty("showHeader", true);
+ window->rootObject()->setProperty("showHeader", true);
gridview->positionViewAtBeginning();
QTRY_COMPARE(gridview->contentX(), -30.);
QTRY_COMPARE(gridview->contentX(), 400.); // 8*80 - 240 (8 columns)
gridview->setContentX(80);
- canvas->rootObject()->setProperty("showFooter", true);
+ window->rootObject()->setProperty("showFooter", true);
gridview->positionViewAtEnd();
QTRY_COMPARE(gridview->contentX(), 430.);
QVERIFY(gridview->highlightItem());
QCOMPARE(gridview->highlightItem()->x(), 80.);
- delete canvas;
+ delete window;
}
void tst_QQuickGridView::snapping()
{
- QQuickView *canvas = createView();
+ QQuickView *window = createView();
QaimModel model;
for (int i = 0; i < 40; i++)
model.addItem("Item" + QString::number(i), "");
- canvas->rootContext()->setContextProperty("testModel", &model);
- canvas->setSource(testFileUrl("gridview1.qml"));
+ window->rootContext()->setContextProperty("testModel", &model);
+ window->setSource(testFileUrl("gridview1.qml"));
qApp->processEvents();
- QQuickGridView *gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid");
+ QQuickGridView *gridview = findItem<QQuickGridView>(window->rootObject(), "grid");
QTRY_VERIFY(gridview != 0);
gridview->setHeight(220);
gridview->positionViewAtIndex(15, QQuickGridView::End);
QCOMPARE(gridview->contentY(), 120.);
- delete canvas;
+ delete window;
}
void tst_QQuickGridView::mirroring()
{
- QQuickView *canvasA = createView();
- canvasA->setSource(testFileUrl("mirroring.qml"));
- QQuickGridView *gridviewA = findItem<QQuickGridView>(canvasA->rootObject(), "view");
+ QQuickView *windowA = createView();
+ windowA->setSource(testFileUrl("mirroring.qml"));
+ QQuickGridView *gridviewA = findItem<QQuickGridView>(windowA->rootObject(), "view");
QTRY_VERIFY(gridviewA != 0);
- QQuickView *canvasB = createView();
- canvasB->setSource(testFileUrl("mirroring.qml"));
- QQuickGridView *gridviewB = findItem<QQuickGridView>(canvasB->rootObject(), "view");
+ QQuickView *windowB = createView();
+ windowB->setSource(testFileUrl("mirroring.qml"));
+ QQuickGridView *gridviewB = findItem<QQuickGridView>(windowB->rootObject(), "view");
QTRY_VERIFY(gridviewA != 0);
qApp->processEvents();
foreach (const QString objectName, objectNames)
QCOMPARE(findItem<QQuickItem>(gridviewA, objectName)->x(), findItem<QQuickItem>(gridviewB, objectName)->x());
- delete canvasA;
- delete canvasB;
+ delete windowA;
+ delete windowB;
}
void tst_QQuickGridView::positionViewAtIndex_rightToLeft()
{
- QQuickView *canvas = createView();
+ QQuickView *window = createView();
QaimModel model;
for (int i = 0; i < 40; i++)
model.addItem("Item" + QString::number(i), "");
- QQmlContext *ctxt = canvas->rootContext();
+ QQmlContext *ctxt = window->rootContext();
ctxt->setContextProperty("testModel", &model);
ctxt->setContextProperty("testTopToBottom", QVariant(true));
ctxt->setContextProperty("testRightToLeft", QVariant(true));
ctxt->setContextProperty("testBottomToTop", QVariant(false));
- canvas->setSource(testFileUrl("layouts.qml"));
+ window->setSource(testFileUrl("layouts.qml"));
qApp->processEvents();
- QQuickGridView *gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid");
+ QQuickGridView *gridview = findItem<QQuickGridView>(window->rootObject(), "grid");
QTRY_VERIFY(gridview != 0);
QQuickItem *contentItem = gridview->contentItem();
gridview->positionViewAtIndex(20, QQuickGridView::Contain);
QTRY_COMPARE(gridview->contentX(), -560.);
- delete canvas;
+ delete window;
}
void tst_QQuickGridView::resetModel()
{
- QQuickView *canvas = createView();
+ QQuickView *window = createView();
QStringList strings;
strings << "one" << "two" << "three";
QStringListModel model(strings);
- QQmlContext *ctxt = canvas->rootContext();
+ QQmlContext *ctxt = window->rootContext();
ctxt->setContextProperty("testModel", &model);
- canvas->setSource(testFileUrl("displaygrid.qml"));
- canvas->show();
+ window->setSource(testFileUrl("displaygrid.qml"));
+ window->show();
qApp->processEvents();
- QQuickGridView *gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid");
+ QQuickGridView *gridview = findItem<QQuickGridView>(window->rootObject(), "grid");
QTRY_VERIFY(gridview != 0);
QQuickItem *contentItem = gridview->contentItem();
QTRY_VERIFY(contentItem != 0);
QTRY_COMPARE(display->text(), strings.at(i));
}
- delete canvas;
+ delete window;
}
void tst_QQuickGridView::enforceRange()
{
- QQuickView *canvas = createView();
+ QQuickView *window = createView();
QaimModel model;
for (int i = 0; i < 30; i++)
model.addItem("Item" + QString::number(i), "");
- QQmlContext *ctxt = canvas->rootContext();
+ QQmlContext *ctxt = window->rootContext();
ctxt->setContextProperty("testModel", &model);
ctxt->setContextProperty("testRightToLeft", QVariant(false));
ctxt->setContextProperty("testTopToBottom", QVariant(false));
- canvas->setSource(testFileUrl("gridview-enforcerange.qml"));
- canvas->show();
+ window->setSource(testFileUrl("gridview-enforcerange.qml"));
+ window->show();
qApp->processEvents();
- QVERIFY(canvas->rootObject() != 0);
+ QVERIFY(window->rootObject() != 0);
- QQuickGridView *gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid");
+ QQuickGridView *gridview = findItem<QQuickGridView>(window->rootObject(), "grid");
QTRY_VERIFY(gridview != 0);
QTRY_COMPARE(gridview->preferredHighlightBegin(), 100.0);
ctxt->setContextProperty("testModel", &model2);
QCOMPARE(gridview->count(), 5);
- delete canvas;
+ delete window;
}
void tst_QQuickGridView::enforceRange_rightToLeft()
{
- QQuickView *canvas = createView();
+ QQuickView *window = createView();
QaimModel model;
for (int i = 0; i < 30; i++)
model.addItem("Item" + QString::number(i), "");
- QQmlContext *ctxt = canvas->rootContext();
+ QQmlContext *ctxt = window->rootContext();
ctxt->setContextProperty("testModel", &model);
ctxt->setContextProperty("testRightToLeft", QVariant(true));
ctxt->setContextProperty("testTopToBottom", QVariant(true));
- canvas->setSource(testFileUrl("gridview-enforcerange.qml"));
+ window->setSource(testFileUrl("gridview-enforcerange.qml"));
qApp->processEvents();
- QVERIFY(canvas->rootObject() != 0);
+ QVERIFY(window->rootObject() != 0);
- QQuickGridView *gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid");
+ QQuickGridView *gridview = findItem<QQuickGridView>(window->rootObject(), "grid");
QTRY_VERIFY(gridview != 0);
QCOMPARE(gridview->preferredHighlightBegin(), 100.0);
ctxt->setContextProperty("testModel", &model2);
QCOMPARE(gridview->count(), 5);
- delete canvas;
+ delete window;
}
void tst_QQuickGridView::QTBUG_8456()
{
- QQuickView *canvas = createView();
+ QQuickView *window = createView();
- canvas->setSource(testFileUrl("setindex.qml"));
+ window->setSource(testFileUrl("setindex.qml"));
qApp->processEvents();
- QQuickGridView *gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid");
+ QQuickGridView *gridview = findItem<QQuickGridView>(window->rootObject(), "grid");
QTRY_VERIFY(gridview != 0);
QTRY_COMPARE(gridview->currentIndex(), 0);
- delete canvas;
+ delete window;
}
void tst_QQuickGridView::manualHighlight()
{
- QQuickView *canvas = createView();
+ QQuickView *window = createView();
QString filename(testFile("manual-highlight.qml"));
- canvas->setSource(QUrl::fromLocalFile(filename));
+ window->setSource(QUrl::fromLocalFile(filename));
qApp->processEvents();
- QQuickGridView *gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid");
+ QQuickGridView *gridview = findItem<QQuickGridView>(window->rootObject(), "grid");
QTRY_VERIFY(gridview != 0);
QQuickItem *contentItem = gridview->contentItem();
QTRY_COMPARE(gridview->highlightItem()->y() - 5, gridview->currentItem()->y());
QTRY_COMPARE(gridview->highlightItem()->x() - 5, gridview->currentItem()->x());
- delete canvas;
+ delete window;
}
QFETCH(QPointF, firstDelegatePos);
QFETCH(QPointF, resizeContentPos);
- QQuickView *canvas = getView();
- canvas->show();
+ QQuickView *window = getView();
+ window->show();
QaimModel model;
for (int i = 0; i < 7; i++)
model.addItem("Item" + QString::number(i), "");
- QQmlContext *ctxt = canvas->rootContext();
+ QQmlContext *ctxt = window->rootContext();
ctxt->setContextProperty("testModel", &model);
- canvas->setSource(testFileUrl("footer.qml"));
+ window->setSource(testFileUrl("footer.qml"));
qApp->processEvents();
- QQuickGridView *gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid");
+ QQuickGridView *gridview = findItem<QQuickGridView>(window->rootObject(), "grid");
QTRY_VERIFY(gridview != 0);
gridview->setFlow(flow);
gridview->setLayoutDirection(layoutDirection);
// remove all items
model.clear();
+ if (flow == QQuickGridView::FlowLeftToRight)
+ QTRY_COMPARE(gridview->contentHeight(), footer->height());
+ else
+ QTRY_COMPARE(gridview->contentWidth(), footer->width());
QPointF posWhenNoItems(0, 0);
if (layoutDirection == Qt::RightToLeft)
QTRY_COMPARE(footer->pos(), posWhenNoItems);
// if header is toggled, it shouldn't affect the footer position
- canvas->rootObject()->setProperty("showHeader", true);
+ window->rootObject()->setProperty("showHeader", true);
QVERIFY(findItem<QQuickItem>(contentItem, "header") != 0);
QTRY_COMPARE(footer->pos(), posWhenNoItems);
- canvas->rootObject()->setProperty("showHeader", false);
+ window->rootObject()->setProperty("showHeader", false);
// add 30 items
for (int i = 0; i < 30; i++)
model.addItem("Item" + QString::number(i), "");
QSignalSpy footerItemSpy(gridview, SIGNAL(footerItemChanged()));
- QMetaObject::invokeMethod(canvas->rootObject(), "changeFooter");
+ QMetaObject::invokeMethod(window->rootObject(), "changeFooter");
QCOMPARE(footerItemSpy.count(), 1);
footer->setWidth(40);
QTRY_COMPARE(QPointF(gridview->contentX(), gridview->contentY()), resizeContentPos);
- releaseView(canvas);
+ releaseView(window);
}
void tst_QQuickGridView::footer_data()
<< QPointF(-(6 * 80) - 40, -320);
}
+void tst_QQuickGridView::initialZValues()
+{
+ QQuickView *window = createView();
+ window->setSource(testFileUrl("initialZValues.qml"));
+ qApp->processEvents();
+
+ QQuickGridView *gridview = findItem<QQuickGridView>(window->rootObject(), "grid");
+ QTRY_VERIFY(gridview != 0);
+ QQuickItem *contentItem = gridview->contentItem();
+ QTRY_VERIFY(contentItem != 0);
+
+ QVERIFY(gridview->headerItem());
+ QTRY_COMPARE(gridview->headerItem()->z(), gridview->property("initialZ").toReal());
+
+ QVERIFY(gridview->footerItem());
+ QTRY_COMPARE(gridview->footerItem()->z(), gridview->property("initialZ").toReal());
+
+ delete window;
+}
+
void tst_QQuickGridView::header()
{
QFETCH(QQuickGridView::Flow, flow);
for (int i = 0; i < 30; i++)
model.addItem("Item" + QString::number(i), "");
- QQuickView *canvas = getView();
- canvas->rootContext()->setContextProperty("testModel", &model);
- canvas->rootContext()->setContextProperty("initialViewWidth", 240);
- canvas->rootContext()->setContextProperty("initialViewHeight", 320);
- canvas->setSource(testFileUrl("header.qml"));
- canvas->show();
+ QQuickView *window = getView();
+ window->rootContext()->setContextProperty("testModel", &model);
+ window->rootContext()->setContextProperty("initialViewWidth", 240);
+ window->rootContext()->setContextProperty("initialViewHeight", 320);
+ window->setSource(testFileUrl("header.qml"));
+ window->show();
qApp->processEvents();
- QQuickGridView *gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid");
+ QQuickGridView *gridview = findItem<QQuickGridView>(window->rootObject(), "grid");
QTRY_VERIFY(gridview != 0);
gridview->setFlow(flow);
gridview->setLayoutDirection(layoutDirection);
model.clear();
QTRY_COMPARE(QQuickItemPrivate::get(gridview)->polishScheduled, false);
QCOMPARE(header->pos(), initialHeaderPos); // header should stay where it is
+ if (flow == QQuickGridView::FlowLeftToRight)
+ QCOMPARE(gridview->contentHeight(), header->height());
+ else
+ QCOMPARE(gridview->contentWidth(), header->width());
for (int i = 0; i < 30; i++)
model.addItem("Item" + QString::number(i), "");
QSignalSpy headerItemSpy(gridview, SIGNAL(headerItemChanged()));
- QMetaObject::invokeMethod(canvas->rootObject(), "changeHeader");
+ QMetaObject::invokeMethod(window->rootObject(), "changeHeader");
QCOMPARE(headerItemSpy.count(), 1);
header->setWidth(40);
QTRY_COMPARE(QPointF(gridview->contentX(), gridview->contentY()), resizeContentPos);
- releaseView(canvas);
+ releaseView(window);
// QTBUG-21207 header should become visible if view resizes from initial empty size
- canvas = getView();
- canvas->rootContext()->setContextProperty("testModel", &model);
- canvas->rootContext()->setContextProperty("initialViewWidth", 240);
- canvas->rootContext()->setContextProperty("initialViewHeight", 320);
- canvas->setSource(testFileUrl("header.qml"));
- canvas->show();
+ window = getView();
+ window->rootContext()->setContextProperty("testModel", &model);
+ window->rootContext()->setContextProperty("initialViewWidth", 240);
+ window->rootContext()->setContextProperty("initialViewHeight", 320);
+ window->setSource(testFileUrl("header.qml"));
+ window->show();
qApp->processEvents();
- gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid");
+ gridview = findItem<QQuickGridView>(window->rootObject(), "grid");
QTRY_VERIFY(gridview != 0);
gridview->setFlow(flow);
gridview->setLayoutDirection(layoutDirection);
QTRY_COMPARE(gridview->headerItem()->pos(), initialHeaderPos);
QCOMPARE(QPointF(gridview->contentX(), gridview->contentY()), initialContentPos);
- releaseView(canvas);
+ releaseView(window);
}
void tst_QQuickGridView::header_data()
qreal maxX() const { return maxXExtent(); }
};
-void tst_QQuickGridView::headerFooter()
+void tst_QQuickGridView::extents()
{
QFETCH(QQuickGridView::Flow, flow);
QFETCH(Qt::LayoutDirection, layoutDirection);
QFETCH(QPointF, footerPos);
QFETCH(QPointF, minPos);
QFETCH(QPointF, maxPos);
+ QFETCH(QPointF, origin_empty);
+ QFETCH(QPointF, origin_nonEmpty);
- QQuickView *canvas = getView();
+ QQuickView *window = getView();
QmlListModel model;
- QQmlContext *ctxt = canvas->rootContext();
+ QQmlContext *ctxt = window->rootContext();
ctxt->setContextProperty("testModel", &model);
- canvas->setSource(testFileUrl("headerfooter.qml"));
- canvas->show();
+ window->setSource(testFileUrl("headerfooter.qml"));
+ window->show();
qApp->processEvents();
- QQuickGridView *gridview = qobject_cast<QQuickGridView*>(canvas->rootObject());
+ QQuickGridView *gridview = qobject_cast<QQuickGridView*>(window->rootObject());
QTRY_VERIFY(gridview != 0);
gridview->setFlow(flow);
gridview->setLayoutDirection(layoutDirection);
QCOMPARE(static_cast<GVAccessor*>(gridview)->maxX(), maxPos.x());
QCOMPARE(static_cast<GVAccessor*>(gridview)->maxY(), maxPos.y());
- releaseView(canvas);
+ QCOMPARE(gridview->originX(), origin_empty.x());
+ QCOMPARE(gridview->originY(), origin_empty.y());
+ for (int i=0; i<30; i++)
+ model.addItem("Item" + QString::number(i), "");
+ QTRY_COMPARE(gridview->count(), model.count());
+ QCOMPARE(gridview->originX(), origin_nonEmpty.x());
+ QCOMPARE(gridview->originY(), origin_nonEmpty.y());
+
+ releaseView(window);
}
-void tst_QQuickGridView::headerFooter_data()
+void tst_QQuickGridView::extents_data()
{
QTest::addColumn<QQuickGridView::Flow>("flow");
QTest::addColumn<Qt::LayoutDirection>("layoutDirection");
QTest::addColumn<QPointF>("footerPos");
QTest::addColumn<QPointF>("minPos");
QTest::addColumn<QPointF>("maxPos");
+ QTest::addColumn<QPointF>("origin_empty");
+ QTest::addColumn<QPointF>("origin_nonEmpty");
// header is 240x20 (or 20x320 in TopToBottom)
// footer is 240x30 (or 30x320 in TopToBottom)
+ // grid has 10 rows in LeftToRight mode and 6 columns in TopToBottom
QTest::newRow("LeftToRight, LtR, TtB")
<< QQuickGridView::FlowLeftToRight << Qt::LeftToRight << QQuickItemView::TopToBottom
<< QPointF(0, -20) << QPointF(0, 0)
- << QPointF(0, 20) << QPointF(240, 20);
+ << QPointF(0, 20) << QPointF(240, 20)
+ << QPointF(0, -20) << QPointF(0, -20);
QTest::newRow("LeftToRight, RtL, TtB")
<< QQuickGridView::FlowLeftToRight << Qt::RightToLeft << QQuickItemView::TopToBottom
<< QPointF(0, -20) << QPointF(0, 0)
- << QPointF(0, 20) << QPointF(240, 20);
+ << QPointF(0, 20) << QPointF(240, 20)
+ << QPointF(0, -20) << QPointF(0, -20);
QTest::newRow("LeftToRight, LtR, BtT")
<< QQuickGridView::FlowLeftToRight << Qt::LeftToRight << QQuickItemView::BottomToTop
<< QPointF(0, 0) << QPointF(0, -30)
- << QPointF(0, 320 - 20) << QPointF(240, 320 - 20); // content flow is reversed
+ << QPointF(0, 320 - 20) << QPointF(240, 320 - 20) // content flow is reversed
+ << QPointF(0, -30) << QPointF(0, (-60.0 * 10) - 30);
QTest::newRow("LeftToRight, RtL, BtT")
<< QQuickGridView::FlowLeftToRight << Qt::RightToLeft << QQuickItemView::BottomToTop
<< QPointF(0, 0) << QPointF(0, -30)
- << QPointF(0, 320 - 20) << QPointF(240, 320 - 20); // content flow is reversed
+ << QPointF(0, 320 - 20) << QPointF(240, 320 - 20) // content flow is reversed
+ << QPointF(0, -30) << QPointF(0, (-60.0 * 10) - 30);
QTest::newRow("TopToBottom, LtR, TtB")
<< QQuickGridView::FlowTopToBottom << Qt::LeftToRight << QQuickItemView::TopToBottom
<< QPointF(-20, 0) << QPointF(0, 0)
- << QPointF(20, 0) << QPointF(20, 320);
+ << QPointF(20, 0) << QPointF(20, 320)
+ << QPointF(-20, 0) << QPointF(-20, 0);
QTest::newRow("TopToBottom, RtL, TtB")
<< QQuickGridView::FlowTopToBottom << Qt::RightToLeft << QQuickItemView::TopToBottom
<< QPointF(0, 0) << QPointF(-30, 0)
- << QPointF(240 - 20, 0) << QPointF(240 - 20, 320); // content flow is reversed
+ << QPointF(240 - 20, 0) << QPointF(240 - 20, 320) // content flow is reversed
+ << QPointF(-30, 0) << QPointF((-80.0 * 6) - 30, 0);
QTest::newRow("TopToBottom, LtR, BtT")
<< QQuickGridView::FlowTopToBottom << Qt::LeftToRight << QQuickItemView::BottomToTop
<< QPointF(-20, -320) << QPointF(0, -320)
- << QPointF(20, 0) << QPointF(20, 320);
+ << QPointF(20, 0) << QPointF(20, 320)
+ << QPointF(-20, 0) << QPointF(-20, 0);
QTest::newRow("TopToBottom, RtL, BtT")
<< QQuickGridView::FlowTopToBottom << Qt::RightToLeft << QQuickItemView::BottomToTop
<< QPointF(0, -320) << QPointF(-30, -320)
- << QPointF(240 - 20, 0) << QPointF(240 - 20, 320); // content flow is reversed
+ << QPointF(240 - 20, 0) << QPointF(240 - 20, 320) // content flow is reversed
+ << QPointF(-30, 0) << QPointF((-80.0 * 6) - 30, 0);
}
void tst_QQuickGridView::resetModel_headerFooter()
{
// Resetting a model shouldn't crash in views with header/footer
- QQuickView *canvas = createView();
+ QQuickView *window = createView();
QaimModel model;
for (int i = 0; i < 6; i++)
model.addItem("Item" + QString::number(i), "");
- QQmlContext *ctxt = canvas->rootContext();
+ QQmlContext *ctxt = window->rootContext();
ctxt->setContextProperty("testModel", &model);
- canvas->setSource(testFileUrl("headerfooter.qml"));
+ window->setSource(testFileUrl("headerfooter.qml"));
qApp->processEvents();
- QQuickGridView *gridview = qobject_cast<QQuickGridView*>(canvas->rootObject());
+ QQuickGridView *gridview = qobject_cast<QQuickGridView*>(window->rootObject());
QTRY_VERIFY(gridview != 0);
QQuickItem *contentItem = gridview->contentItem();
QQuickItem *footer = findItem<QQuickItem>(contentItem, "footer");
QVERIFY(footer);
- QCOMPARE(footer->y(), 80.*2);
+ QCOMPARE(footer->y(), 60.*2);
model.reset();
footer = findItem<QQuickItem>(contentItem, "footer");
QVERIFY(footer);
- QCOMPARE(footer->y(), 80.*2);
+ QCOMPARE(footer->y(), 60.*2);
- delete canvas;
+ delete window;
}
void tst_QQuickGridView::resizeViewAndRepaint()
{
- QQuickView *canvas = createView();
- canvas->show();
+ QQuickView *window = createView();
+ window->show();
QaimModel model;
for (int i = 0; i < 40; i++)
model.addItem("Item" + QString::number(i), "");
- QQmlContext *ctxt = canvas->rootContext();
+ QQmlContext *ctxt = window->rootContext();
ctxt->setContextProperty("testModel", &model);
ctxt->setContextProperty("initialWidth", 240);
ctxt->setContextProperty("initialHeight", 100);
- canvas->setSource(testFileUrl("resizeview.qml"));
- canvas->show();
+ window->setSource(testFileUrl("resizeview.qml"));
+ window->show();
qApp->processEvents();
- QQuickGridView *gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid");
+ QQuickGridView *gridview = findItem<QQuickGridView>(window->rootObject(), "grid");
QTRY_VERIFY(gridview != 0);
QQuickItem *contentItem = gridview->contentItem();
QTRY_VERIFY(contentItem != 0);
QTRY_VERIFY(item);
QTRY_COMPARE(item->x(), qreal((i%3)*80));
QTRY_COMPARE(item->y(), qreal((i/3)*60));
- QCOMPARE(item->isVisible(), i < 9); // inside view visible, outside not visible
+ QCOMPARE(delegateVisible(item), i < 9); // inside view visible, outside not visible
}
// ensure items outside view become invisible
QTRY_VERIFY(item);
QTRY_COMPARE(item->x(), qreal((i%3)*80));
QTRY_COMPARE(item->y(), qreal((i/3)*60));
- QCOMPARE(item->isVisible(), i < 6); // inside view visible, outside not visible
+ QCOMPARE(delegateVisible(item), i < 6); // inside view visible, outside not visible
}
- delete canvas;
+ delete window;
}
void tst_QQuickGridView::resizeGrid()
for (int i = 0; i < 30; i++)
model.addItem("Item" + QString::number(i), "");
- QQuickView *canvas = getView();
- QQmlContext *ctxt = canvas->rootContext();
+ QQuickView *window = getView();
+ QQmlContext *ctxt = window->rootContext();
ctxt->setContextProperty("testModel", &model);
ctxt->setContextProperty("testTopToBottom", flow == QQuickGridView::FlowTopToBottom);
ctxt->setContextProperty("testRightToLeft", layoutDirection == Qt::RightToLeft);
ctxt->setContextProperty("testBottomToTop", verticalLayoutDirection == QQuickGridView::BottomToTop);
- canvas->setSource(testFileUrl("resizegrid.qml"));
- canvas->show();
+ window->setSource(testFileUrl("resizegrid.qml"));
+ window->show();
qApp->processEvents();
- QQuickGridView *gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid");
+ QQuickGridView *gridview = findItem<QQuickGridView>(window->rootObject(), "grid");
QTRY_VERIFY(gridview != 0);
QQuickItem *contentItem = gridview->contentItem();
QTRY_VERIFY(contentItem != 0);
// set the width to slightly larger than 3 items across, to test
// items are aligned correctly in right-to-left
- canvas->rootObject()->setWidth(260);
- canvas->rootObject()->setHeight(320);
+ window->rootObject()->setWidth(260);
+ window->rootObject()->setHeight(320);
QTRY_COMPARE(QQuickItemPrivate::get(gridview)->polishScheduled, false);
QCOMPARE(gridview->contentX(), initialContentPos.x());
}
// change from 3x5 grid to 4x7
- canvas->rootObject()->setWidth(canvas->rootObject()->width() + 80);
- canvas->rootObject()->setHeight(canvas->rootObject()->height() + 60*2);
+ window->rootObject()->setWidth(window->rootObject()->width() + 80);
+ window->rootObject()->setHeight(window->rootObject()->height() + 60*2);
QTRY_COMPARE(QQuickItemPrivate::get(gridview)->polishScheduled, false);
// other than in LeftToRight+RightToLeft layout, the first item should not move
QCOMPARE(name->text(), model.name(i));
}
- releaseView(canvas);
+ releaseView(window);
}
void tst_QQuickGridView::resizeGrid_data()
for (int i = 0; i < 40; i++)
model.addItem("Item" + QString::number(i), "");
- QQuickView *canvas = createView();
- QQmlContext *ctxt = canvas->rootContext();
+ QQuickView *window = createView();
+ QQmlContext *ctxt = window->rootContext();
ctxt->setContextProperty("testModel", &model);
ctxt->setContextProperty("initialWidth", 100);
ctxt->setContextProperty("initialHeight", 320);
- canvas->setSource(testFileUrl("resizeview.qml"));
- canvas->show();
+ window->setSource(testFileUrl("resizeview.qml"));
+ window->show();
qApp->processEvents();
- QQuickGridView *gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid");
+ QQuickGridView *gridview = findItem<QQuickGridView>(window->rootObject(), "grid");
QTRY_VERIFY(gridview != 0);
QQuickItem *contentItem = gridview->contentItem();
QTRY_VERIFY(contentItem != 0);
QCOMPARE(item->y(), qreal(i*60));
}
- delete canvas;
+ delete window;
}
void tst_QQuickGridView::indexAt_itemAt_data()
QFETCH(qreal, y);
QFETCH(int, index);
- QQuickView *canvas = getView();
+ QQuickView *window = getView();
QaimModel model;
model.addItem("Fred", "12345");
model.addItem("Ben", "04321");
model.addItem("Jim", "0780");
- canvas->rootContext()->setContextProperty("testModel", &model);
- canvas->setSource(testFileUrl("gridview1.qml"));
+ window->rootContext()->setContextProperty("testModel", &model);
+ window->setSource(testFileUrl("gridview1.qml"));
qApp->processEvents();
- QQuickGridView *gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid");
+ QQuickGridView *gridview = findItem<QQuickGridView>(window->rootObject(), "grid");
QTRY_VERIFY(gridview != 0);
QQuickItem *contentItem = gridview->contentItem();
QCOMPARE(gridview->indexAt(x, y), index);
QVERIFY(gridview->itemAt(x, y) == item);
- releaseView(canvas);
+ releaseView(window);
}
void tst_QQuickGridView::onAdd()
const int delegateWidth = 50;
const int delegateHeight = 100;
QaimModel model;
- QQuickView *canvas = getView();
- canvas->setGeometry(0,0,5 * delegateWidth, 5 * delegateHeight); // just ensure all items fit
+ QQuickView *window = getView();
+ window->setGeometry(0,0,5 * delegateWidth, 5 * delegateHeight); // just ensure all items fit
// these initial items should not trigger GridView.onAdd
for (int i=0; i<initialItemCount; i++)
model.addItem("dummy value", "dummy value");
- QQmlContext *ctxt = canvas->rootContext();
+ QQmlContext *ctxt = window->rootContext();
ctxt->setContextProperty("testModel", &model);
ctxt->setContextProperty("delegateWidth", delegateWidth);
ctxt->setContextProperty("delegateHeight", delegateHeight);
- canvas->setSource(testFileUrl("attachedSignals.qml"));
+ window->setSource(testFileUrl("attachedSignals.qml"));
- QObject *object = canvas->rootObject();
- object->setProperty("width", canvas->width());
- object->setProperty("height", canvas->height());
+ QObject *object = window->rootObject();
+ object->setProperty("width", window->width());
+ object->setProperty("height", window->height());
qApp->processEvents();
QList<QPair<QString, QString> > items;
items << qMakePair(QString("value %1").arg(i), QString::number(i));
model.addItems(items);
- QTRY_COMPARE(model.count(), qobject_cast<QQuickGridView*>(canvas->rootObject())->count());
+ QTRY_COMPARE(model.count(), qobject_cast<QQuickGridView*>(window->rootObject())->count());
qApp->processEvents();
QVariantList result = object->property("addedDelegates").toList();
for (int i=0; i<items.count(); i++)
QCOMPARE(result[i].toString(), items[i].first);
- releaseView(canvas);
+ releaseView(window);
}
void tst_QQuickGridView::onAdd_data()
for (int i=0; i<initialItemCount; i++)
model.addItem(QString("value %1").arg(i), "dummy value");
- QQuickView *canvas = getView();
- QQmlContext *ctxt = canvas->rootContext();
+ QQuickView *window = getView();
+ QQmlContext *ctxt = window->rootContext();
ctxt->setContextProperty("testModel", &model);
ctxt->setContextProperty("delegateWidth", delegateWidth);
ctxt->setContextProperty("delegateHeight", delegateHeight);
- canvas->setSource(testFileUrl("attachedSignals.qml"));
- QObject *object = canvas->rootObject();
+ window->setSource(testFileUrl("attachedSignals.qml"));
+ QObject *object = window->rootObject();
model.removeItems(indexToRemove, removeCount);
- QTRY_COMPARE(model.count(), qobject_cast<QQuickGridView*>(canvas->rootObject())->count());
+ QTRY_COMPARE(model.count(), qobject_cast<QQuickGridView*>(window->rootObject())->count());
QCOMPARE(object->property("removedDelegateCount"), QVariant(removeCount));
- releaseView(canvas);
+ releaseView(window);
}
void tst_QQuickGridView::onRemove_data()
void tst_QQuickGridView::columnCount()
{
- QQuickView canvas;
- canvas.setSource(testFileUrl("gridview4.qml"));
- canvas.show();
- canvas.requestActivateWindow();
- QTest::qWaitForWindowShown(&canvas);
+ QQuickView window;
+ window.setSource(testFileUrl("gridview4.qml"));
+ window.show();
+ window.requestActivateWindow();
+ QTest::qWaitForWindowShown(&window);
- QQuickGridView *view = qobject_cast<QQuickGridView*>(canvas.rootObject());
+ QQuickGridView *view = qobject_cast<QQuickGridView*>(window.rootObject());
QCOMPARE(view->cellWidth(), qreal(405)/qreal(9));
QCOMPARE(view->cellHeight(), qreal(100));
void tst_QQuickGridView::margins()
{
{
- QQuickView *canvas = createView();
+ QQuickView *window = createView();
QaimModel model;
for (int i = 0; i < 40; i++)
model.addItem("Item" + QString::number(i), "");
- QQmlContext *ctxt = canvas->rootContext();
+ QQmlContext *ctxt = window->rootContext();
ctxt->setContextProperty("testModel", &model);
ctxt->setContextProperty("testRightToLeft", QVariant(false));
- canvas->setSource(testFileUrl("margins.qml"));
- canvas->show();
+ window->setSource(testFileUrl("margins.qml"));
+ window->show();
qApp->processEvents();
- QQuickGridView *gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid");
+ QQuickGridView *gridview = findItem<QQuickGridView>(window->rootObject(), "grid");
QTRY_VERIFY(gridview != 0);
QQuickItem *contentItem = gridview->contentItem();
QTRY_VERIFY(contentItem != 0);
QTRY_COMPARE(QQuickItemPrivate::get(gridview)->polishScheduled, false);
QCOMPARE(gridview->contentX(), -30.);
- QCOMPARE(gridview->xOrigin(), 0.);
+ QCOMPARE(gridview->originX(), 0.);
// check end bound
gridview->positionViewAtEnd();
QTRY_COMPARE(gridview->contentX(), pos + 50);
// remove item before visible and check that left margin is maintained
- // and xOrigin is updated
+ // and originX is updated
gridview->setContentX(200);
model.removeItems(0, 4);
QTest::qWait(100);
gridview->setContentX(-50);
gridview->returnToBounds();
- QCOMPARE(gridview->xOrigin(), 100.);
+ QCOMPARE(gridview->originX(), 100.);
QTRY_COMPARE(gridview->contentX(), 70.);
// reduce left margin
gridview->setLeftMargin(20);
- QCOMPARE(gridview->xOrigin(), 100.);
+ QCOMPARE(gridview->originX(), 100.);
QTRY_COMPARE(gridview->contentX(), 80.);
// check end bound
gridview->positionViewAtEnd();
- QCOMPARE(gridview->xOrigin(), 0.); // positionViewAtEnd() resets origin
+ QCOMPARE(gridview->originX(), 0.); // positionViewAtEnd() resets origin
pos = gridview->contentX();
gridview->setContentX(pos + 80);
gridview->returnToBounds();
// reduce right margin
pos = gridview->contentX();
gridview->setRightMargin(40);
- QCOMPARE(gridview->xOrigin(), 0.);
+ QCOMPARE(gridview->originX(), 0.);
QTRY_COMPARE(gridview->contentX(), pos-10);
- delete canvas;
+ delete window;
}
{
//RTL
- QQuickView *canvas = createView();
- canvas->show();
+ QQuickView *window = createView();
+ window->show();
QaimModel model;
for (int i = 0; i < 40; i++)
model.addItem("Item" + QString::number(i), "");
- QQmlContext *ctxt = canvas->rootContext();
+ QQmlContext *ctxt = window->rootContext();
ctxt->setContextProperty("testModel", &model);
ctxt->setContextProperty("testRightToLeft", QVariant(true));
- canvas->setSource(testFileUrl("margins.qml"));
+ window->setSource(testFileUrl("margins.qml"));
qApp->processEvents();
- QQuickGridView *gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid");
+ QQuickGridView *gridview = findItem<QQuickGridView>(window->rootObject(), "grid");
QTRY_VERIFY(gridview != 0);
QQuickItem *contentItem = gridview->contentItem();
QTRY_VERIFY(contentItem != 0);
QTRY_COMPARE(gridview->contentX(), -240+50.);
- QTRY_COMPARE(gridview->xOrigin(), 0.);
+ QTRY_COMPARE(gridview->originX(), -100. * 10);
// check end bound
gridview->positionViewAtEnd();
QTRY_COMPARE(gridview->contentX(), pos - 30);
// remove item before visible and check that left margin is maintained
- // and xOrigin is updated
+ // and originX is updated
gridview->setContentX(-400);
QTRY_COMPARE(QQuickItemPrivate::get(gridview)->polishScheduled, false);
model.removeItems(0, 4);
QTRY_COMPARE(model.count(), gridview->count());
gridview->setContentX(-240+50);
gridview->returnToBounds();
- QCOMPARE(gridview->xOrigin(), -100.);
+ QCOMPARE(gridview->originX(), -1000.);
QTRY_COMPARE(gridview->contentX(), -240-50.);
// reduce right margin
pos = gridview->contentX();
gridview->setRightMargin(40);
- QCOMPARE(gridview->xOrigin(), -100.);
+ QCOMPARE(gridview->originX(), -1000.);
QTRY_COMPARE(gridview->contentX(), -240-100 + 40.);
// check end bound
gridview->positionViewAtEnd();
- QCOMPARE(gridview->xOrigin(), 0.); // positionViewAtEnd() resets origin
+ QCOMPARE(gridview->originX(), -900.); // positionViewAtEnd() resets origin
pos = gridview->contentX();
gridview->setContentX(pos - 80);
gridview->returnToBounds();
// reduce left margin
pos = gridview->contentX();
gridview->setLeftMargin(20);
- QCOMPARE(gridview->xOrigin(), 0.);
+ QCOMPARE(gridview->originX(), -900.);
QTRY_COMPARE(gridview->contentX(), pos+10);
- delete canvas;
+ delete window;
}
}
void tst_QQuickGridView::creationContext()
{
- QQuickView canvas;
- canvas.setGeometry(0,0,240,320);
- canvas.setSource(testFileUrl("creationContext.qml"));
+ QQuickView window;
+ window.setGeometry(0,0,240,320);
+ window.setSource(testFileUrl("creationContext.qml"));
qApp->processEvents();
- QQuickItem *rootItem = qobject_cast<QQuickItem *>(canvas.rootObject());
+ QQuickItem *rootItem = qobject_cast<QQuickItem *>(window.rootObject());
QVERIFY(rootItem);
QVERIFY(rootItem->property("count").toInt() > 0);
QQuickItem *item;
- QVERIFY(item = rootItem->findChild<QQuickItem *>("listItem"));
+ QVERIFY(item = findItem<QQuickItem>(rootItem, "listItem"));
QCOMPARE(item->property("text").toString(), QString("Hello!"));
QVERIFY(item = rootItem->findChild<QQuickItem *>("header"));
QCOMPARE(item->property("text").toString(), QString("Hello!"));
QFETCH(qreal, endExtent);
QFETCH(qreal, startExtent);
- QQuickView *canvas = getView();
+ QQuickView *window = getView();
- canvas->setSource(testFileUrl("snapToRow.qml"));
- canvas->show();
+ window->setSource(testFileUrl("snapToRow.qml"));
+ window->show();
qApp->processEvents();
- QQuickGridView *gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid");
+ QQuickGridView *gridview = findItem<QQuickGridView>(window->rootObject(), "grid");
QTRY_VERIFY(gridview != 0);
gridview->setFlow(flow);
QTRY_VERIFY(contentItem != 0);
// confirm that a flick hits an item boundary
- flick(canvas, flickStart, flickEnd, 180);
+ flick(window, flickStart, flickEnd, 180);
QTRY_VERIFY(gridview->isMoving() == false); // wait until it stops
if (flow == QQuickGridView::FlowLeftToRight)
QCOMPARE(qreal(fmod(gridview->contentY(),80.0)), snapAlignment);
// flick to end
do {
- flick(canvas, flickStart, flickEnd, 180);
+ flick(window, flickStart, flickEnd, 180);
QTRY_VERIFY(gridview->isMoving() == false); // wait until it stops
} while (flow == QQuickGridView::FlowLeftToRight
? !gridview->isAtYEnd()
// flick to start
do {
- flick(canvas, flickEnd, flickStart, 180);
+ flick(window, flickEnd, flickStart, 180);
QTRY_VERIFY(gridview->isMoving() == false); // wait until it stops
} while (flow == QQuickGridView::FlowLeftToRight
? !gridview->isAtYBeginning()
else
QCOMPARE(gridview->contentX(), startExtent);
- releaseView(canvas);
+ releaseView(window);
}
void tst_QQuickGridView::snapOneRow_data()
QFETCH(qreal, endExtent);
QFETCH(qreal, startExtent);
- QQuickView *canvas = getView();
+ QQuickView *window = getView();
- canvas->setSource(testFileUrl("snapOneRow.qml"));
- canvas->show();
+ window->setSource(testFileUrl("snapOneRow.qml"));
+ window->show();
qApp->processEvents();
- QQuickGridView *gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid");
+ QQuickGridView *gridview = findItem<QQuickGridView>(window->rootObject(), "grid");
QTRY_VERIFY(gridview != 0);
gridview->setFlow(flow);
QSignalSpy currentIndexSpy(gridview, SIGNAL(currentIndexChanged()));
// confirm that a flick hits next row boundary
- flick(canvas, flickStart, flickEnd, 180);
+ flick(window, flickStart, flickEnd, 180);
QTRY_VERIFY(gridview->isMoving() == false); // wait until it stops
if (flow == QQuickGridView::FlowLeftToRight)
QCOMPARE(gridview->contentY(), snapAlignment);
// flick to end
do {
- flick(canvas, flickStart, flickEnd, 180);
+ flick(window, flickStart, flickEnd, 180);
QTRY_VERIFY(gridview->isMoving() == false); // wait until it stops
} while (flow == QQuickGridView::FlowLeftToRight
? !gridview->isAtYEnd()
// flick to start
do {
- flick(canvas, flickEnd, flickStart, 180);
+ flick(window, flickEnd, flickStart, 180);
QTRY_VERIFY(gridview->isMoving() == false); // wait until it stops
} while (flow == QQuickGridView::FlowLeftToRight
? !gridview->isAtYBeginning()
QCOMPARE(currentIndexSpy.count(), 6);
}
- releaseView(canvas);
+ releaseView(window);
}
void tst_QQuickGridView::unaligned()
{
- QQuickView *canvas = createView();
- canvas->show();
+ QQuickView *window = createView();
+ window->show();
QaimModel model;
for (int i = 0; i < 10; i++)
model.addItem("Item" + QString::number(i), "");
- QQmlContext *ctxt = canvas->rootContext();
+ QQmlContext *ctxt = window->rootContext();
ctxt->setContextProperty("testModel", &model);
- canvas->setSource(testFileUrl("unaligned.qml"));
+ window->setSource(testFileUrl("unaligned.qml"));
qApp->processEvents();
- QQuickGridView *gridview = qobject_cast<QQuickGridView*>(canvas->rootObject());
+ QQuickGridView *gridview = qobject_cast<QQuickGridView*>(window->rootObject());
QVERIFY(gridview != 0);
QQuickItem *contentItem = gridview->contentItem();
QCOMPARE(item->y(), qreal(i/9)*gridview->cellHeight());
}
- delete canvas;
+ delete window;
}
void tst_QQuickGridView::populateTransitions()
model.addItem("item" + QString::number(i), "");
}
- QQuickView *canvas = getView();
- canvas->rootContext()->setContextProperty("testModel", &model);
- canvas->rootContext()->setContextProperty("usePopulateTransition", usePopulateTransition);
- canvas->rootContext()->setContextProperty("dynamicallyPopulate", dynamicallyPopulate);
- canvas->rootContext()->setContextProperty("transitionFrom", transitionFrom);
- canvas->rootContext()->setContextProperty("transitionVia", transitionVia);
- canvas->rootContext()->setContextProperty("model_transitionFrom", &model_transitionFrom);
- canvas->rootContext()->setContextProperty("model_transitionVia", &model_transitionVia);
- canvas->setSource(testFileUrl("populateTransitions.qml"));
- canvas->show();
-
- QQuickGridView *gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid");
+ QQuickView *window = getView();
+ window->rootContext()->setContextProperty("testModel", &model);
+ window->rootContext()->setContextProperty("usePopulateTransition", usePopulateTransition);
+ window->rootContext()->setContextProperty("dynamicallyPopulate", dynamicallyPopulate);
+ window->rootContext()->setContextProperty("transitionFrom", transitionFrom);
+ window->rootContext()->setContextProperty("transitionVia", transitionVia);
+ window->rootContext()->setContextProperty("model_transitionFrom", &model_transitionFrom);
+ window->rootContext()->setContextProperty("model_transitionVia", &model_transitionVia);
+ window->setSource(testFileUrl("populateTransitions.qml"));
+ window->show();
+
+ QQuickGridView *gridview = findItem<QQuickGridView>(window->rootObject(), "grid");
QVERIFY(gridview);
QQuickItem *contentItem = gridview->contentItem();
QVERIFY(contentItem);
QTRY_COMPARE(gridview->property("countPopulateTransitions").toInt(), 0);
// clear the model
- canvas->rootContext()->setContextProperty("testModel", QVariant());
+ window->rootContext()->setContextProperty("testModel", QVariant());
QTRY_COMPARE(gridview->count(), 0);
QTRY_COMPARE(findItems<QQuickItem>(contentItem, "wrapper").count(), 0);
gridview->setProperty("countPopulateTransitions", 0);
model.clear();
for (int i = 0; i < 30; i++)
model.addItem("item" + QString::number(i), "");
- canvas->rootContext()->setContextProperty("testModel", &model);
+ window->rootContext()->setContextProperty("testModel", &model);
QTRY_COMPARE(QQuickItemPrivate::get(gridview)->polishScheduled, false);
QTRY_COMPARE(gridview->property("countPopulateTransitions").toInt(), usePopulateTransition ? 18 : 0);
QTRY_COMPARE(name->text(), model.name(i));
}
- releaseView(canvas);
+ releaseView(window);
}
void tst_QQuickGridView::populateTransitions_data()
QaimModel model_targetItems_transitionFrom;
QaimModel model_displacedItems_transitionVia;
- QQuickView *canvas = getView();
- QQmlContext *ctxt = canvas->rootContext();
+ QQuickView *window = getView();
+ QQmlContext *ctxt = window->rootContext();
ctxt->setContextProperty("testModel", &model);
ctxt->setContextProperty("model_targetItems_transitionFrom", &model_targetItems_transitionFrom);
ctxt->setContextProperty("model_displacedItems_transitionVia", &model_displacedItems_transitionVia);
ctxt->setContextProperty("targetItems_transitionFrom", targetItems_transitionFrom);
ctxt->setContextProperty("displacedItems_transitionVia", displacedItems_transitionVia);
- canvas->setSource(testFileUrl("addTransitions.qml"));
- canvas->show();
+ window->setSource(testFileUrl("addTransitions.qml"));
+ window->show();
- QQuickGridView *gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid");
+ QQuickGridView *gridview = findItem<QQuickGridView>(window->rootObject(), "grid");
QTRY_VERIFY(gridview != 0);
QQuickItem *contentItem = gridview->contentItem();
QVERIFY(contentItem != 0);
QCOMPARE(name->text(), model.name(i));
}
- releaseView(canvas);
+ releaseView(window);
}
void tst_QQuickGridView::addTransitions_data()
QaimModel model_targetItems_transitionVia;
QaimModel model_displacedItems_transitionVia;
- QQuickView *canvas = getView();
- QQmlContext *ctxt = canvas->rootContext();
+ QQuickView *window = getView();
+ QQmlContext *ctxt = window->rootContext();
ctxt->setContextProperty("testModel", &model);
ctxt->setContextProperty("model_targetItems_transitionVia", &model_targetItems_transitionVia);
ctxt->setContextProperty("model_displacedItems_transitionVia", &model_displacedItems_transitionVia);
ctxt->setContextProperty("targetItems_transitionVia", targetItems_transitionVia);
ctxt->setContextProperty("displacedItems_transitionVia", displacedItems_transitionVia);
- canvas->setSource(testFileUrl("moveTransitions.qml"));
- canvas->show();
+ window->setSource(testFileUrl("moveTransitions.qml"));
+ window->show();
- QQuickGridView *gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid");
+ QQuickGridView *gridview = findItem<QQuickGridView>(window->rootObject(), "grid");
QTRY_VERIFY(gridview != 0);
QQuickItem *contentItem = gridview->contentItem();
QVERIFY(contentItem != 0);
QTRY_COMPARE(name->text(), model.name(i));
}
- releaseView(canvas);
+ releaseView(window);
}
void tst_QQuickGridView::moveTransitions_data()
QaimModel model_targetItems_transitionTo;
QaimModel model_displacedItems_transitionVia;
- QQuickView *canvas = getView();
- QQmlContext *ctxt = canvas->rootContext();
+ QQuickView *window = getView();
+ QQmlContext *ctxt = window->rootContext();
ctxt->setContextProperty("testModel", &model);
ctxt->setContextProperty("model_targetItems_transitionTo", &model_targetItems_transitionTo);
ctxt->setContextProperty("model_displacedItems_transitionVia", &model_displacedItems_transitionVia);
ctxt->setContextProperty("targetItems_transitionTo", targetItems_transitionTo);
ctxt->setContextProperty("displacedItems_transitionVia", displacedItems_transitionVia);
- canvas->setSource(testFileUrl("removeTransitions.qml"));
- canvas->show();
+ window->setSource(testFileUrl("removeTransitions.qml"));
+ window->show();
- QQuickGridView *gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid");
+ QQuickGridView *gridview = findItem<QQuickGridView>(window->rootObject(), "grid");
QTRY_VERIFY(gridview != 0);
QQuickItem *contentItem = gridview->contentItem();
QVERIFY(contentItem != 0);
QTRY_COMPARE(name->text(), model.name(i));
}
- releaseView(canvas);
+ releaseView(window);
}
void tst_QQuickGridView::removeTransitions_data()
QPointF moveDisplaced_transitionVia(50, -100);
QPointF removeDisplaced_transitionVia(150, 100);
- QQuickView *canvas = getView();
- QQmlContext *ctxt = canvas->rootContext();
+ QQuickView *window = getView();
+ QQmlContext *ctxt = window->rootContext();
ctxt->setContextProperty("testModel", &model);
ctxt->setContextProperty("model_displaced_transitionVia", &model_displaced_transitionVia);
ctxt->setContextProperty("model_addDisplaced_transitionVia", &model_addDisplaced_transitionVia);
ctxt->setContextProperty("moveDisplacedEnabled", moveDisplacedEnabled);
ctxt->setContextProperty("useRemoveDisplaced", useRemoveDisplaced);
ctxt->setContextProperty("removeDisplacedEnabled", removeDisplacedEnabled);
- canvas->setSource(testFileUrl("displacedTransitions.qml"));
- canvas->show();
+ window->setSource(testFileUrl("displacedTransitions.qml"));
+ window->show();
qApp->processEvents();
- QQuickGridView *gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid");
+ QQuickGridView *gridview = findItem<QQuickGridView>(window->rootObject(), "grid");
QTRY_VERIFY(gridview != 0);
QQuickItem *contentItem = gridview->contentItem();
QVERIFY(contentItem != 0);
break;
case ListChange::SetCurrent:
case ListChange::SetContentY:
+ case ListChange::Polish:
break;
}
QTRY_COMPARE(name->text(), model.name(i));
}
- releaseView(canvas);
+ releaseView(window);
}
void tst_QQuickGridView::displacedTransitions_data()
for (int i = 0; i < initialCount; i++)
model.addItem("Original item" + QString::number(i), "");
- QQuickView *canvas = getView();
- QQmlContext *ctxt = canvas->rootContext();
+ QQuickView *window = getView();
+ QQmlContext *ctxt = window->rootContext();
ctxt->setContextProperty("testModel", &model);
ctxt->setContextProperty("addTargets_transitionFrom", addTargets_transitionFrom);
ctxt->setContextProperty("addDisplaced_transitionFrom", addDisplaced_transitionFrom);
ctxt->setContextProperty("enableMoveTransitions", enableMoveTransitions);
ctxt->setContextProperty("enableRemoveTransitions", enableRemoveTransitions);
ctxt->setContextProperty("rippleAddDisplaced", rippleAddDisplaced);
- canvas->setSource(testFileUrl("multipleTransitions.qml"));
- canvas->show();
- QTest::qWaitForWindowShown(canvas);
+ window->setSource(testFileUrl("multipleTransitions.qml"));
+ window->show();
+ QTest::qWaitForWindowShown(window);
- QQuickGridView *gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid");
+ QQuickGridView *gridview = findItem<QQuickGridView>(window->rootObject(), "grid");
QTRY_VERIFY(gridview != 0);
QQuickItem *contentItem = gridview->contentItem();
QVERIFY(contentItem != 0);
QTRY_COMPARE(QQuickItemPrivate::get(gridview)->polishScheduled, false);
}
- int timeBetweenActions = canvas->rootObject()->property("timeBetweenActions").toInt();
+ int timeBetweenActions = window->rootObject()->property("timeBetweenActions").toInt();
for (int i=0; i<changes.count(); i++) {
switch (changes[i].type) {
gridview->setContentY(changes[i].pos);
QTRY_COMPARE(QQuickItemPrivate::get(gridview)->polishScheduled, false);
break;
+ case ListChange::Polish:
+ break;
}
}
QCOMPARE(gridview->count(), model.count());
QTRY_COMPARE(name->text(), model.name(i));
}
- releaseView(canvas);
+ releaseView(window);
}
void tst_QQuickGridView::multipleTransitions_data()
for (int i = 0; i < 30; i++)
model.addItem("Original item" + QString::number(i), "");
- QQuickView *canvas = createView();
- QQmlContext *ctxt = canvas->rootContext();
+ QQuickView *window = createView();
+ QQmlContext *ctxt = window->rootContext();
ctxt->setContextProperty("testModel", &model);
- canvas->setSource(testFileUrl("multipleDisplaced.qml"));
- canvas->show();
- QTest::qWaitForWindowShown(canvas);
+ window->setSource(testFileUrl("multipleDisplaced.qml"));
+ window->show();
+ QTest::qWaitForWindowShown(window);
- QQuickGridView *gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid");
+ QQuickGridView *gridview = findItem<QQuickGridView>(window->rootObject(), "grid");
QTRY_VERIFY(gridview != 0);
QQuickItem *contentItem = gridview->contentItem();
QVERIFY(contentItem != 0);
QTRY_COMPARE(QQuickItemPrivate::get(gridview)->polishScheduled, false);
model.moveItems(12, 8, 1);
- QTest::qWait(canvas->rootObject()->property("duration").toInt() / 2);
+ QTest::qWait(window->rootObject()->property("duration").toInt() / 2);
model.moveItems(8, 3, 1);
QTRY_VERIFY(gridview->property("displaceTransitionsDone").toBool());
QTRY_COMPARE(name->text(), model.name(i));
}
- delete canvas;
+ delete window;
}
void tst_QQuickGridView::cacheBuffer()
{
- QQuickView *canvas = createView();
+ QQuickView *window = createView();
QaimModel model;
for (int i = 0; i < 90; i++)
model.addItem("Item" + QString::number(i), "");
- canvas->rootContext()->setContextProperty("testModel", &model);
- canvas->setSource(testFileUrl("gridview1.qml"));
- canvas->show();
+ window->rootContext()->setContextProperty("testModel", &model);
+ window->setSource(testFileUrl("gridview1.qml"));
+ window->show();
qApp->processEvents();
- QQuickGridView *gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid");
+ QQuickGridView *gridview = findItem<QQuickGridView>(window->rootObject(), "grid");
QVERIFY(gridview != 0);
QQuickItem *contentItem = gridview->contentItem();
}
QQmlIncubationController controller;
- canvas->engine()->setIncubationController(&controller);
+ window->engine()->setIncubationController(&controller);
- canvas->rootObject()->setProperty("cacheBuffer", 200);
+ window->rootObject()->setProperty("cacheBuffer", 200);
QTRY_VERIFY(gridview->cacheBuffer() == 200);
// items will be created one at a time
controller.incubateWhile(&b);
}
- delete canvas;
+ delete window;
}
void tst_QQuickGridView::asynchronous()
{
- QQuickView *canvas = createView();
- canvas->show();
+ QQuickView *window = createView();
+ window->show();
QQmlIncubationController controller;
- canvas->engine()->setIncubationController(&controller);
+ window->engine()->setIncubationController(&controller);
- canvas->setSource(testFileUrl("asyncloader.qml"));
+ window->setSource(testFileUrl("asyncloader.qml"));
- QQuickItem *rootObject = qobject_cast<QQuickItem*>(canvas->rootObject());
+ QQuickItem *rootObject = qobject_cast<QQuickItem*>(window->rootObject());
QVERIFY(rootObject);
QQuickGridView *gridview = 0;
QVERIFY(item->y() == (i/3)*100);
}
- delete canvas;
+ delete window;
}
void tst_QQuickGridView::unrequestedVisibility()
for (int i = 0; i < 30; i++)
model.addItem("Item" + QString::number(i), QString::number(i));
- QQuickView *canvas = new QQuickView(0);
- canvas->setGeometry(0,0,240,320);
+ QQuickView *window = new QQuickView(0);
+ window->setGeometry(0,0,240,320);
- QQmlContext *ctxt = canvas->rootContext();
+ QQmlContext *ctxt = window->rootContext();
ctxt->setContextProperty("testModel", &model);
ctxt->setContextProperty("testWrap", QVariant(false));
- canvas->setSource(testFileUrl("unrequestedItems.qml"));
+ window->setSource(testFileUrl("unrequestedItems.qml"));
- canvas->show();
+ window->show();
qApp->processEvents();
- QQuickGridView *leftview = findItem<QQuickGridView>(canvas->rootObject(), "leftGrid");
+ QQuickGridView *leftview = findItem<QQuickGridView>(window->rootObject(), "leftGrid");
QTRY_VERIFY(leftview != 0);
- QQuickGridView *rightview = findItem<QQuickGridView>(canvas->rootObject(), "rightGrid");
+ QQuickGridView *rightview = findItem<QQuickGridView>(window->rootObject(), "rightGrid");
QTRY_VERIFY(rightview != 0);
QQuickItem *leftContent = leftview->contentItem();
QQuickItem *item;
QVERIFY(item = findItem<QQuickItem>(leftContent, "wrapper", 1));
- QCOMPARE(item->isVisible(), true);
+ QCOMPARE(delegateVisible(item), true);
QVERIFY(item = findItem<QQuickItem>(rightContent, "wrapper", 1));
- QCOMPARE(item->isVisible(), false);
+ QCOMPARE(delegateVisible(item), false);
QVERIFY(item = findItem<QQuickItem>(leftContent, "wrapper", 11));
- QCOMPARE(item->isVisible(), false);
+ QCOMPARE(delegateVisible(item), false);
QVERIFY(item = findItem<QQuickItem>(rightContent, "wrapper", 11));
- QCOMPARE(item->isVisible(), true);
+ QCOMPARE(delegateVisible(item), true);
QVERIFY(item = findItem<QQuickItem>(leftContent, "wrapper", 9));
- QCOMPARE(item->isVisible(), true);
+ QCOMPARE(delegateVisible(item), true);
QVERIFY(item = findItem<QQuickItem>(leftContent, "wrapper", 10));
- QCOMPARE(item->isVisible(), false);
+ QCOMPARE(delegateVisible(item), false);
QVERIFY(item = findItem<QQuickItem>(rightContent, "wrapper", 3));
- QCOMPARE(item->isVisible(), false);
+ QCOMPARE(delegateVisible(item), false);
QVERIFY(item = findItem<QQuickItem>(rightContent, "wrapper", 4));
- QCOMPARE(item->isVisible(), true);
+ QCOMPARE(delegateVisible(item), true);
rightview->setCurrentIndex(0);
QTRY_COMPARE(rightview->contentY(), 0.0);
QVERIFY(item = findItem<QQuickItem>(leftContent, "wrapper", 1));
- QCOMPARE(item->isVisible(), true);
+ QCOMPARE(delegateVisible(item), true);
QVERIFY(item = findItem<QQuickItem>(rightContent, "wrapper", 1));
- QTRY_COMPARE(item->isVisible(), true);
+ QTRY_COMPARE(delegateVisible(item), true);
QVERIFY(!findItem<QQuickItem>(leftContent, "wrapper", 11));
QVERIFY(!findItem<QQuickItem>(rightContent, "wrapper", 11));
QTRY_COMPARE(rightview->contentY(), 0.0);
QVERIFY(item = findItem<QQuickItem>(leftContent, "wrapper", 1));
- QTRY_COMPARE(item->isVisible(), false);
+ QTRY_COMPARE(delegateVisible(item), false);
QVERIFY(item = findItem<QQuickItem>(rightContent, "wrapper", 1));
- QCOMPARE(item->isVisible(), true);
+ QCOMPARE(delegateVisible(item), true);
QVERIFY(item = findItem<QQuickItem>(leftContent, "wrapper", 11));
- QCOMPARE(item->isVisible(), true);
+ QCOMPARE(delegateVisible(item), true);
QVERIFY(item = findItem<QQuickItem>(rightContent, "wrapper", 11));
- QCOMPARE(item->isVisible(), false);
+ QCOMPARE(delegateVisible(item), false);
QVERIFY(item = findItem<QQuickItem>(leftContent, "wrapper", 3));
- QCOMPARE(item->isVisible(), false);
+ QCOMPARE(delegateVisible(item), false);
QVERIFY(item = findItem<QQuickItem>(leftContent, "wrapper", 5));
- QCOMPARE(item->isVisible(), true);
+ QCOMPARE(delegateVisible(item), true);
QVERIFY(item = findItem<QQuickItem>(rightContent, "wrapper", 9));
- QCOMPARE(item->isVisible(), true);
+ QCOMPARE(delegateVisible(item), true);
QVERIFY(item = findItem<QQuickItem>(rightContent, "wrapper", 10));
- QCOMPARE(item->isVisible(), false);
+ QCOMPARE(delegateVisible(item), false);
// move a non-visible item into view
model.moveItems(10, 9, 1);
QTRY_COMPARE(QQuickItemPrivate::get(leftview)->polishScheduled, false);
QTRY_VERIFY(item = findItem<QQuickItem>(leftContent, "wrapper", 1));
- QCOMPARE(item->isVisible(), false);
+ QCOMPARE(delegateVisible(item), false);
QVERIFY(item = findItem<QQuickItem>(rightContent, "wrapper", 1));
- QCOMPARE(item->isVisible(), true);
+ QCOMPARE(delegateVisible(item), true);
QVERIFY(item = findItem<QQuickItem>(leftContent, "wrapper", 11));
- QCOMPARE(item->isVisible(), true);
+ QCOMPARE(delegateVisible(item), true);
QVERIFY(item = findItem<QQuickItem>(rightContent, "wrapper", 11));
- QCOMPARE(item->isVisible(), false);
+ QCOMPARE(delegateVisible(item), false);
QVERIFY(item = findItem<QQuickItem>(leftContent, "wrapper", 3));
- QCOMPARE(item->isVisible(), false);
+ QCOMPARE(delegateVisible(item), false);
QVERIFY(item = findItem<QQuickItem>(leftContent, "wrapper", 5));
- QCOMPARE(item->isVisible(), true);
+ QCOMPARE(delegateVisible(item), true);
QVERIFY(item = findItem<QQuickItem>(rightContent, "wrapper", 9));
- QCOMPARE(item->isVisible(), true);
+ QCOMPARE(delegateVisible(item), true);
QVERIFY(item = findItem<QQuickItem>(rightContent, "wrapper", 10));
- QCOMPARE(item->isVisible(), false);
+ QCOMPARE(delegateVisible(item), false);
// move a visible item out of view
model.moveItems(5, 3, 1);
QTRY_COMPARE(QQuickItemPrivate::get(leftview)->polishScheduled, false);
QVERIFY(item = findItem<QQuickItem>(leftContent, "wrapper", 3));
- QCOMPARE(item->isVisible(), false);
+ QCOMPARE(delegateVisible(item), false);
QVERIFY(item = findItem<QQuickItem>(leftContent, "wrapper", 5));
- QCOMPARE(item->isVisible(), true);
+ QCOMPARE(delegateVisible(item), true);
QVERIFY(item = findItem<QQuickItem>(rightContent, "wrapper", 9));
- QCOMPARE(item->isVisible(), true);
+ QCOMPARE(delegateVisible(item), true);
QVERIFY(item = findItem<QQuickItem>(rightContent, "wrapper", 10));
- QCOMPARE(item->isVisible(), false);
+ QCOMPARE(delegateVisible(item), false);
// move a non-visible item into view
model.moveItems(3, 5, 1);
QTRY_COMPARE(QQuickItemPrivate::get(leftview)->polishScheduled, false);
QVERIFY(item = findItem<QQuickItem>(leftContent, "wrapper", 3));
- QCOMPARE(item->isVisible(), false);
+ QCOMPARE(delegateVisible(item), false);
QVERIFY(item = findItem<QQuickItem>(leftContent, "wrapper", 5));
- QCOMPARE(item->isVisible(), true);
+ QCOMPARE(delegateVisible(item), true);
QVERIFY(item = findItem<QQuickItem>(rightContent, "wrapper", 9));
- QCOMPARE(item->isVisible(), true);
+ QCOMPARE(delegateVisible(item), true);
QVERIFY(item = findItem<QQuickItem>(rightContent, "wrapper", 10));
- QCOMPARE(item->isVisible(), false);
+ QCOMPARE(delegateVisible(item), false);
// move a visible item out of view
model.moveItems(9, 10, 1);
QTRY_COMPARE(QQuickItemPrivate::get(leftview)->polishScheduled, false);
QVERIFY(item = findItem<QQuickItem>(leftContent, "wrapper", 3));
- QCOMPARE(item->isVisible(), false);
+ QCOMPARE(delegateVisible(item), false);
QVERIFY(item = findItem<QQuickItem>(leftContent, "wrapper", 5));
- QCOMPARE(item->isVisible(), true);
+ QCOMPARE(delegateVisible(item), true);
QVERIFY(item = findItem<QQuickItem>(rightContent, "wrapper", 9));
- QCOMPARE(item->isVisible(), true);
+ QCOMPARE(delegateVisible(item), true);
QVERIFY(item = findItem<QQuickItem>(rightContent, "wrapper", 10));
- QCOMPARE(item->isVisible(), false);
+ QCOMPARE(delegateVisible(item), false);
// move a non-visible item into view
model.moveItems(10, 9, 1);
QTRY_COMPARE(QQuickItemPrivate::get(leftview)->polishScheduled, false);
QVERIFY(item = findItem<QQuickItem>(leftContent, "wrapper", 3));
- QCOMPARE(item->isVisible(), false);
+ QCOMPARE(delegateVisible(item), false);
QVERIFY(item = findItem<QQuickItem>(leftContent, "wrapper", 5));
- QCOMPARE(item->isVisible(), true);
+ QCOMPARE(delegateVisible(item), true);
QVERIFY(item = findItem<QQuickItem>(rightContent, "wrapper", 9));
- QCOMPARE(item->isVisible(), true);
+ QCOMPARE(delegateVisible(item), true);
QVERIFY(item = findItem<QQuickItem>(rightContent, "wrapper", 10));
- QCOMPARE(item->isVisible(), false);
+ QCOMPARE(delegateVisible(item), false);
- delete canvas;
+ delete window;
}
projects / profile / ivi / qtdeclarative.git / blobdiff