2 files changed, 120 insertions, 0 deletions
diff --git a/tests/auto/quick/qquicklistview/data/displayMargin.qml b/tests/auto/quick/qquicklistview/data/displayMargin.qml
new file mode 100644
index 0000000000..fde48bc5b9
--- /dev/null
+++ b/tests/auto/quick/qquicklistview/data/displayMargin.qml
@@ -0,0 +1,82 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Jolla Ltd.
+** 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
+
+Item {
+    width: 400; height: 400
+
+    ListView {
+        id: view
+        anchors.top: header.bottom
+        anchors.bottom: footer.top
+        width: parent.width
+
+        cacheBuffer: 0
+        displayMarginBeginning: 60
+        displayMarginEnd: 60
+
+        model: 100
+        delegate: Rectangle {
+            objectName: "delegate"
+            width: parent.width
+            height: 25
+            color: index % 2 ? "steelblue" : "lightsteelblue"
+            Text {
+                anchors.centerIn: parent
+                text: index
+            }
+        }
+    }
+
+    Rectangle {
+        id: header
+        width: parent.width; height: 60
+        color: "#80FF0000"
+    }
+
+    Rectangle {
+        id: footer
+        anchors.bottom: parent.bottom
+        width: parent.width; height: 60
+        color: "#80FF0000"
+    }
+}
diff --git a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
index a0045a244f..f741fec159 100644
--- a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
+++ b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
@@ -215,6 +215,7 @@ private slots:
     void testProxyModelChangedAfterMove();
 
     void typedModel();
+    void displayMargin();
 
     void highlightItemGeometryChanges();
 
@@ -7039,6 +7040,43 @@ void tst_QQuickListView::typedModel()
     QCOMPARE(listview->count(), 0);
 }
 
+void tst_QQuickListView::displayMargin()
+{
+    QQuickView *window = createView();
+    window->setSource(testFileUrl("displayMargin.qml"));
+    window->show();
+    QVERIFY(QTest::qWaitForWindowExposed(window));
+
+    QQuickListView *listview = window->rootObject()->findChild<QQuickListView*>();
+    QVERIFY(listview != 0);
+
+    QQuickItem *content = listview->contentItem();
+    QVERIFY(content != 0);
+
+    QQuickItem *item0;
+    QQuickItem *item14;
+
+    QVERIFY(item0 = findItem<QQuickItem>(content, "delegate", 0));
+    QCOMPARE(delegateVisible(item0), true);
+
+    // the 14th item should be within the end margin
+    QVERIFY(item14 = findItem<QQuickItem>(content, "delegate", 13));
+    QCOMPARE(delegateVisible(item14), true);
+
+    // the 15th item should be outside the end margin
+    QVERIFY(findItem<QQuickItem>(content, "delegate", 14) == 0);
+
+    // the first delegate should still be within the begin margin
+    listview->positionViewAtIndex(3, QQuickListView::Beginning);
+    QCOMPARE(delegateVisible(item0), true);
+
+    // the first delegate should now be outside the begin margin
+    listview->positionViewAtIndex(4, QQuickListView::Beginning);
+    QCOMPARE(delegateVisible(item0), false);
+
+    delete window;
+}
+
 void tst_QQuickListView::highlightItemGeometryChanges()
 {
     QQmlEngine engine;