From 297ee9cc2cfbc9e797aee3ce660484f682bb4e61 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Thu, 15 May 2014 10:02:43 +0200 Subject: Make ItemViews displayMargin work correctly when set to negative values We need to call forceLayoutPolish instead of refillOrLayout so that the visibility is correctly updated. Also update one line that sets visibility in GridView Change-Id: I29fa67cdd5196a744fab9507b4104cb83ad4bf5e Reviewed-by: Martin Jones --- .../qquicklistview/data/negativeDisplayMargin.qml | 115 +++++++++++++++++++++ .../quick/qquicklistview/tst_qquicklistview.cpp | 44 ++++++++ 2 files changed, 159 insertions(+) create mode 100644 tests/auto/quick/qquicklistview/data/negativeDisplayMargin.qml (limited to 'tests/auto/quick/qquicklistview') diff --git a/tests/auto/quick/qquicklistview/data/negativeDisplayMargin.qml b/tests/auto/quick/qquicklistview/data/negativeDisplayMargin.qml new file mode 100644 index 0000000000..64d9ce1956 --- /dev/null +++ b/tests/auto/quick/qquicklistview/data/negativeDisplayMargin.qml @@ -0,0 +1,115 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Canonical Limited and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.3 + +ListView { + id: list + width: 400 + height: 600 + model: ListModel { + ListElement { kind: "Bought" } + ListElement { kind: "Available To Buy" } + } + + delegate: ListView { + id: innerList + objectName: "innerList" + height: count * lineHeight + width: list.width + interactive: false + property int count: 50 + model: count + property int createdItems: 0 + property int destroyedItems: 0 + property int lineHeight: 85 + + delegate: Item { + objectName: "delegate" + width: innerList.width + height: innerList.lineHeight + Rectangle { + width: parent.width - 20 + height: parent.height - 20 + anchors.centerIn: parent + color: Math.random() * 2 > 1 ? "green" : "yellow"; + Text { + text: index + } + Component.onCompleted: createdItems++ + Component.onDestruction: destroyedItems++ + } + } + + displayMarginBeginning: 0 + displayMarginEnd: -height + + function updatedDelegateCreationRange() { + if (list.contentY + list.height <= innerList.y) { + // Not visible + innerList.displayMarginBeginning = 0 + innerList.displayMarginEnd = -innerList.height + } else if (innerList.y + innerList.height <= list.contentY) { + // Not visible + innerList.displayMarginBeginning = -innerList.height + innerList.displayMarginEnd = 0 + } else { + innerList.displayMarginBeginning = -Math.max(list.contentY - innerList.y, 0) + innerList.displayMarginEnd = -Math.max(innerList.height - list.height - list.contentY + innerList.y, 0) + } + } + + Component.onCompleted: updatedDelegateCreationRange(); + onHeightChanged: updatedDelegateCreationRange(); + Connections { + target: list + onContentYChanged: updatedDelegateCreationRange(); + onHeightChanged: updatedDelegateCreationRange(); + } + } + + section.property: "kind" + section.delegate: Text { + height: 40 + font.pixelSize: 30 + text: section + } +} diff --git a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp index 5cc3c7e642..2093265163 100644 --- a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp +++ b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp @@ -218,6 +218,7 @@ private slots: void typedModel(); void displayMargin(); + void negativeDisplayMargin(); void highlightItemGeometryChanges(); @@ -7150,6 +7151,49 @@ void tst_QQuickListView::displayMargin() delete window; } +void tst_QQuickListView::negativeDisplayMargin() +{ + QQuickItem *item; + QQuickView *window = createView(); + window->setSource(testFileUrl("negativeDisplayMargin.qml")); + window->show(); + QVERIFY(QTest::qWaitForWindowExposed(window)); + + QQuickItem *listview = window->rootObject(); + QQuickListView *innerList = findItem(window->rootObject(), "innerList"); + QVERIFY(innerList != 0); + + QTRY_COMPARE(innerList->property("createdItems").toInt(), 11); + QCOMPARE(innerList->property("destroyedItem").toInt(), 0); + + QQuickItem *content = innerList->contentItem(); + QVERIFY(content != 0); + + QVERIFY(item = findItem(content, "delegate", 0)); + QCOMPARE(delegateVisible(item), true); + + QVERIFY(item = findItem(content, "delegate", 7)); + QCOMPARE(delegateVisible(item), true); + + QVERIFY(item = findItem(content, "delegate", 8)); + QCOMPARE(delegateVisible(item), false); + + // Flick until contentY means that delegate8 should be visible + listview->setProperty("contentY", 500); + QVERIFY(item = findItem(content, "delegate", 8)); + QTRY_COMPARE(delegateVisible(item), true); + + listview->setProperty("contentY", 1000); + QTRY_VERIFY(item = findItem(content, "delegate", 14)); + QTRY_COMPARE(delegateVisible(item), true); + + listview->setProperty("contentY", 0); + QTRY_VERIFY(item = findItem(content, "delegate", 4)); + QTRY_COMPARE(delegateVisible(item), true); + + delete window; +} + void tst_QQuickListView::highlightItemGeometryChanges() { QScopedPointer window(createView()); -- cgit v1.2.3