Tumbler: add wrap property

[ChangeLog][Tumbler] Added wrap property to control whether or not
tumbler wraps when it reaches the top and bottom.

Change-Id: I27c543d98f7bc574bc5dc882a130abe0dcc13cea
Task-number: QTBUG-53587
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>

2 files changed, 62 insertions, 82 deletions

diff --git a/tests/manual/gifs/data/qtquickcontrols2-tumbler-wrap.qml b/tests/manual/gifs/data/qtquickcontrols2-tumbler-wrap.qml
index e1139177..abfa7bca 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-tumbler-wrap.qml
+++ b/tests/manual/gifs/data/qtquickcontrols2-tumbler-wrap.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the test suite of the Qt Toolkit.
@@ -38,82 +38,59 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.6
-import QtQuick.Window 2.0
-import QtQuick.Controls 2.0
+import QtQuick 2.8
+import QtQuick.Window 2.2
+import QtQuick.Controls 2.1
 
 Window {
-    width: 200
-    height: 200
+    width: frame.implicitWidth + 10
+    height: frame.implicitHeight + 10
     visible: true
 
-    Frame {
-        padding: 0
-        anchors.centerIn: parent
-        width: row.implicitWidth
-        height: row.implicitHeight
-
-        FontMetrics {
-            id: fontMetrics
-        }
+    function formatText(count, modelData) {
+        var data = count === 12 ? modelData + 1 : modelData;
+        return data.toString().length < 2 ? "0" + data : data;
+    }
 
-        Component {
-            id: delegateComponent
+    Component {
+        id: delegateComponent
 
-            Text {
-                text: modelData.toString().length < 2 ? "0" + modelData : modelData
-                color: "#666666"
-                opacity: 0.4 + Math.max(0, 1 - Math.abs(Tumbler.displacement)) * 0.6
-                horizontalAlignment: Text.AlignHCenter
-                verticalAlignment: Text.AlignVCenter
-                font.pixelSize: fontMetrics.font.pixelSize * 1.25
-            }
+        Label {
+            text: formatText(Tumbler.tumbler.count, modelData)
+            opacity: 1.0 - Math.abs(Tumbler.displacement) / (Tumbler.tumbler.visibleItemCount / 2)
+            horizontalAlignment: Text.AlignHCenter
+            verticalAlignment: Text.AlignVCenter
         }
+    }
+
+    Frame {
+        id: frame
+        padding: 0
+        anchors.centerIn: parent
 
         Row {
             id: row
 
             Tumbler {
                 id: hoursTumbler
+                visibleItemCount: 5
                 model: 12
-                delegate: Text {
-                    text: (modelData.toString().length < 2 ? "0" : "") + (modelData + 1)
-                    color: "#666666"
-                    opacity: 0.4 + Math.max(0, 1 - Math.abs(Tumbler.displacement)) * 0.6
-                    horizontalAlignment: Text.AlignHCenter
-                    verticalAlignment: Text.AlignVCenter
-                    font.pixelSize: fontMetrics.font.pixelSize * 1.25
-                }
-                width: 50
-                height: 150
+                delegate: delegateComponent
             }
 
             Tumbler {
                 id: minutesTumbler
-                currentIndex: 6
+                visibleItemCount: 5
                 model: 60
                 delegate: delegateComponent
-                width: 50
-                height: 150
             }
 
             Tumbler {
                 id: amPmTumbler
+                visibleItemCount: 5
+                wrap: false
                 model: ["AM", "PM"]
                 delegate: delegateComponent
-                width: 50
-                height: 150
-                contentItem: ListView {
-                    anchors.fill: parent
-                    model: amPmTumbler.model
-                    delegate: amPmTumbler.delegate
-
-                    snapMode: ListView.SnapToItem
-                    highlightRangeMode: ListView.StrictlyEnforceRange
-                    preferredHighlightBegin: height / 2 - (height / 3 / 2)
-                    preferredHighlightEnd: height / 2  + (height / 3 / 2)
-                    clip: true
-                }
             }
         }
     }
diff --git a/tests/manual/gifs/tst_gifs.cpp b/tests/manual/gifs/tst_gifs.cpp
index 078813e1..f77163b9 100644
--- a/tests/manual/gifs/tst_gifs.cpp
+++ b/tests/manual/gifs/tst_gifs.cpp
@@ -153,37 +153,40 @@ void tst_Gifs::tumblerWrap()
     QTest::mouseMove(window, QPoint(105, 158), 10);
     QTest::mouseMove(window, QPoint(105, 162), 13);
     QTest::mouseRelease(window, Qt::LeftButton, Qt::NoModifier, QPoint(105, 162), 0);
-    QTest::mousePress(window, Qt::LeftButton, Qt::NoModifier, QPoint(154, 130), 1098);
-    QTest::mouseMove(window, QPoint(154, 129), 50);
-    QTest::mouseMove(window, QPoint(153, 128), 0);
-    QTest::mouseMove(window, QPoint(153, 125), 16);
-    QTest::mouseMove(window, QPoint(152, 121), 0);
-    QTest::mouseMove(window, QPoint(152, 117), 17);
-    QTest::mouseMove(window, QPoint(151, 113), 0);
-    QTest::mouseMove(window, QPoint(151, 106), 16);
-    QTest::mouseMove(window, QPoint(150, 99), 1);
-    QTest::mouseMove(window, QPoint(148, 93), 16);
-    QTest::mouseMove(window, QPoint(148, 88), 0);
-    QTest::mouseMove(window, QPoint(148, 84), 17);
-    QTest::mouseMove(window, QPoint(147, 81), 0);
-    QTest::mouseRelease(window, Qt::LeftButton, Qt::NoModifier, QPoint(147, 81), 0);
-    QTest::mousePress(window, Qt::LeftButton, Qt::NoModifier, QPoint(147, 74), 550);
-    QTest::mouseMove(window, QPoint(147, 75), 17);
-    QTest::mouseMove(window, QPoint(147, 76), 17);
-    QTest::mouseMove(window, QPoint(147, 80), 0);
-    QTest::mouseMove(window, QPoint(148, 85), 16);
-    QTest::mouseMove(window, QPoint(148, 92), 0);
-    QTest::mouseMove(window, QPoint(148, 103), 17);
-    QTest::mouseMove(window, QPoint(150, 119), 17);
-    QTest::mouseMove(window, QPoint(151, 138), 16);
-    QTest::mouseMove(window, QPoint(151, 145), 1);
-    QTest::mouseMove(window, QPoint(153, 151), 16);
-    QTest::mouseMove(window, QPoint(153, 157), 0);
-    QTest::mouseMove(window, QPoint(153, 163), 17);
-    QTest::mouseMove(window, QPoint(153, 167), 0);
-    QTest::mouseMove(window, QPoint(155, 171), 17);
-    QTest::mouseMove(window, QPoint(155, 175), 0);
-    QTest::mouseRelease(window, Qt::LeftButton, Qt::NoModifier, QPoint(155, 175), 0);
+    QTest::mousePress(window, Qt::LeftButton, Qt::NoModifier, QPoint(154, 100), 1098);
+    QTest::mouseMove(window, QPoint(154, 99), 16);
+    QTest::mouseMove(window, QPoint(153, 98), 16);
+    QTest::mouseMove(window, QPoint(153, 95), 16);
+    QTest::mouseMove(window, QPoint(152, 91), 15);
+    QTest::mouseMove(window, QPoint(152, 87), 14);
+    QTest::mouseMove(window, QPoint(151, 83), 13);
+    QTest::mouseMove(window, QPoint(151, 86), 13);
+    QTest::mouseMove(window, QPoint(150, 79), 12);
+    QTest::mouseMove(window, QPoint(148, 73), 12);
+    QTest::mouseMove(window, QPoint(148, 68), 12);
+    QTest::mouseMove(window, QPoint(148, 60), 10);
+    QTest::mouseMove(window, QPoint(147, 50), 10);
+    QTest::mouseMove(window, QPoint(147, 40), 9);
+    QTest::mouseMove(window, QPoint(147, 30), 8);
+    QTest::mouseMove(window, QPoint(147, 20), 7);
+    QTest::mouseRelease(window, Qt::LeftButton, Qt::NoModifier, QPoint(147, 20), 0);
+    QTest::mousePress(window, Qt::LeftButton, Qt::NoModifier, QPoint(154, 100), 1000);
+    QTest::mouseMove(window, QPoint(147, 101), 16);
+    QTest::mouseMove(window, QPoint(147, 102), 16);
+    QTest::mouseMove(window, QPoint(147, 105), 16);
+    QTest::mouseMove(window, QPoint(148, 109), 15);
+    QTest::mouseMove(window, QPoint(148, 115), 14);
+    QTest::mouseMove(window, QPoint(148, 120), 13);
+    QTest::mouseMove(window, QPoint(150, 125), 13);
+    QTest::mouseMove(window, QPoint(151, 130), 12);
+    QTest::mouseMove(window, QPoint(151, 135), 12);
+    QTest::mouseMove(window, QPoint(153, 140), 12);
+    QTest::mouseMove(window, QPoint(153, 150), 10);
+    QTest::mouseMove(window, QPoint(153, 160), 10);
+    QTest::mouseMove(window, QPoint(153, 170), 9);
+    QTest::mouseMove(window, QPoint(155, 180), 8);
+    QTest::mouseMove(window, QPoint(155, 188), 7);
+    QTest::mouseRelease(window, Qt::LeftButton, Qt::NoModifier, QPoint(20, 188), 0);
 #endif
 
     gifRecorder.waitForFinish();