aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/quick/qquickpathview/data
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@jollamobile.com>2014-07-23 16:07:31 +1000
committerMartin Jones <martin.jones@jollamobile.com>2014-08-06 01:35:56 +0200
commitc85bfba382ca1ddf0573c8f59e95b25f804b83ff (patch)
treeff08c61e9fc017ba267bc387f377c4299d60b664 /tests/auto/quick/qquickpathview/data
parent89a01dcbc2d427e661c19d50c5b875b1dc54b2f9 (diff)
Synchronize PathView gesture grabbing with other items.
PathView didn't attempt to grab the gesture at the same event as other items. This prevented PathView from rightfully claiming the gesture before lower items in the stack. Use the same threshold test for PathView as used elsewhere. Task-number: QTBUG-37859 Change-Id: Ic57cb805ac979e41c3e35d86b2e7db781e61d69d Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
Diffstat (limited to 'tests/auto/quick/qquickpathview/data')
-rw-r--r--tests/auto/quick/qquickpathview/data/flickableDelegate.qml78
-rw-r--r--tests/auto/quick/qquickpathview/data/nestedInFlickable.qml (renamed from tests/auto/quick/qquickpathview/data/incorrectSteal.qml)0
2 files changed, 78 insertions, 0 deletions
diff --git a/tests/auto/quick/qquickpathview/data/flickableDelegate.qml b/tests/auto/quick/qquickpathview/data/flickableDelegate.qml
new file mode 100644
index 0000000000..ed9c34161f
--- /dev/null
+++ b/tests/auto/quick/qquickpathview/data/flickableDelegate.qml
@@ -0,0 +1,78 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc 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:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+** * Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright
+** notice, this list of conditions and the following disclaimer in
+** the documentation and/or other materials provided with the
+** distribution.
+** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+** of its contributors may be used to endorse or promote products derived
+** from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+
+PathView {
+ id: pathView
+ objectName: "pathView"
+ width: 400
+ height: 200
+
+ dragMargin: 400
+ preferredHighlightBegin: 0.3
+ preferredHighlightEnd: 0.3
+
+ model: 3
+ path: Path {
+ startX: -pathView.width/2
+ startY: pathView.height / 2
+ PathLine { x: pathView.width + pathView.width/2; y: pathView.height / 2 }
+ }
+
+ delegate: Flickable {
+ clip: true
+ flickableDirection: Qt.Horizontal
+ width: 200; height: 200
+ contentWidth: 400
+ contentX: 100
+ Rectangle {
+ y: 50
+ x: 50
+ width: 300
+ height: 100
+ color: "purple"
+ }
+Text { text: index }
+ MouseArea {
+ anchors.fill: parent
+ }
+ }
+}
diff --git a/tests/auto/quick/qquickpathview/data/incorrectSteal.qml b/tests/auto/quick/qquickpathview/data/nestedInFlickable.qml
index bcd6923b73..bcd6923b73 100644
--- a/tests/auto/quick/qquickpathview/data/incorrectSteal.qml
+++ b/tests/auto/quick/qquickpathview/data/nestedInFlickable.qml