diff options
author | J-P Nurmi <jpnurmi@digia.com> | 2014-03-10 15:58:10 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-18 09:05:57 +0100 |
commit | c4c5129632591738c290058abab281ad1b1493c1 (patch) | |
tree | 1281f2a4f3ea9da5da55a7720def36e077716afe /tests/auto/quick/qquicklistview/data | |
parent | fa24ef3d721a7b94d0c5abbc6c9558e74bdb0f3d (diff) |
Item views: improve initial Z-value handling
Respect the initial Z-values of item, highlight, header, footer and
section delegate instances. Mention also the default values in docs.
Change-Id: I2ce4bb537898a0f5fdfa776b79d5747b1c080a7b
Reviewed-by: Michael Brasser <michael.brasser@live.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
Diffstat (limited to 'tests/auto/quick/qquicklistview/data')
4 files changed, 159 insertions, 35 deletions
diff --git a/tests/auto/quick/qquicklistview/data/boundZValues.qml b/tests/auto/quick/qquicklistview/data/boundZValues.qml new file mode 100644 index 0000000000..10810e540d --- /dev/null +++ b/tests/auto/quick/qquicklistview/data/boundZValues.qml @@ -0,0 +1,55 @@ +import QtQuick 2.0 + +Rectangle { + width: 240 + height: 320 + + ListView { + id: list + + property real itemZ: 342 + property real headerZ: 341 + property real footerZ: 340 + property real highlightZ: 339 + property real sectionZ: 338 + + anchors.fill: parent + objectName: "list" + model: ListModel { ListElement { text: "text" } } + currentIndex: 0 + + delegate: Text { + objectName: "wrapper" + font.pointSize: 20 + text: index + z: list.itemZ + } + + header: Rectangle { + width: 240 + height: 30 + z: list.headerZ + } + + footer: Rectangle { + width: 240 + height: 30 + z: list.footerZ + } + + highlight: Rectangle { + width: 240 + height: 30 + z: list.highlightZ + } + + section.property: "text" + section.delegate: Text { + objectName: "section" + font.pointSize: 20 + text: section + z: list.sectionZ + } + } +} + diff --git a/tests/auto/quick/qquicklistview/data/constantZValues.qml b/tests/auto/quick/qquicklistview/data/constantZValues.qml new file mode 100644 index 0000000000..48917fed4f --- /dev/null +++ b/tests/auto/quick/qquicklistview/data/constantZValues.qml @@ -0,0 +1,55 @@ +import QtQuick 2.0 + +Rectangle { + width: 240 + height: 320 + + ListView { + id: list + + property real itemZ: 241 + property real headerZ: 242 + property real footerZ: 243 + property real highlightZ: 244 + property real sectionZ: 245 + + anchors.fill: parent + objectName: "list" + model: ListModel { ListElement { text: "text" } } + currentIndex: 0 + + delegate: Text { + objectName: "wrapper" + font.pointSize: 20 + text: index + z: 241 + } + + header: Rectangle { + width: 240 + height: 30 + z: 242 + } + + footer: Rectangle { + width: 240 + height: 30 + z: 243 + } + + highlight: Rectangle { + width: 240 + height: 30 + z: 244 + } + + section.property: "text" + section.delegate: Text { + objectName: "section" + font.pointSize: 20 + text: section + z: 245 + } + } +} + diff --git a/tests/auto/quick/qquicklistview/data/defaultZValues.qml b/tests/auto/quick/qquicklistview/data/defaultZValues.qml new file mode 100644 index 0000000000..7326340ae4 --- /dev/null +++ b/tests/auto/quick/qquicklistview/data/defaultZValues.qml @@ -0,0 +1,49 @@ +import QtQuick 2.0 + +Rectangle { + width: 240 + height: 320 + + ListView { + id: list + + property real itemZ: 1 + property real headerZ: 1 + property real footerZ: 1 + property real highlightZ: 0 + property real sectionZ: 2 + + anchors.fill: parent + objectName: "list" + model: ListModel { ListElement { text: "text" } } + currentIndex: 0 + + delegate: Text { + objectName: "wrapper" + font.pointSize: 20 + text: index + } + + header: Rectangle { + width: 240 + height: 30 + } + + footer: Rectangle { + width: 240 + height: 30 + } + + highlight: Rectangle { + width: 240 + height: 30 + } + + section.property: "text" + section.delegate: Text { + objectName: "section" + font.pointSize: 20 + text: section + } + } +} diff --git a/tests/auto/quick/qquicklistview/data/initialZValues.qml b/tests/auto/quick/qquicklistview/data/initialZValues.qml deleted file mode 100644 index 3a8e78debb..0000000000 --- a/tests/auto/quick/qquicklistview/data/initialZValues.qml +++ /dev/null @@ -1,35 +0,0 @@ -import QtQuick 2.0 - -Rectangle { - width: 240 - height: 320 - - ListView { - id: list - - property real initialZ: 342 - - anchors.fill: parent - objectName: "list" - model: ListModel {} - - delegate: Text { - objectName: "wrapper" - font.pointSize: 20 - text: index - } - - header: Rectangle { - width: 240 - height: 30 - z: list.initialZ - } - - footer: Rectangle { - width: 240 - height: 30 - z: list.initialZ - } - } -} - |