1
=== modified file 'qml/Components/Carousel.qml'
2
--- qml/Components/Carousel.qml	2014-03-27 10:27:30 +0000
3
+++ qml/Components/Carousel.qml	2014-04-11 08:33:00 +0000
4
@@ -75,6 +75,7 @@
5
75
       The scaling of the items is controlled by the variable continuousIndex, described below. */
75
       The scaling of the items is controlled by the variable continuousIndex, described below. */
6
76
    ListView {
76
    ListView {
7
77
        id: listView
77
        id: listView
8
78
        objectName: "listView"
9
78
79
10
79
        property int highlightIndex: -1
80
        property int highlightIndex: -1
11
80
        property real minimumTileWidth: 0
81
        property real minimumTileWidth: 0
12
@@ -148,15 +149,19 @@
13
148
        maximumFlickVelocity: Math.max(2500 * Math.pow(realWidth / referenceWidth, 1.5), 2500) // 2500 is platform default
149
        maximumFlickVelocity: Math.max(2500 * Math.pow(realWidth / referenceWidth, 1.5), 2500) // 2500 is platform default
14
149
        orientation: ListView.Horizontal
150
        orientation: ListView.Horizontal
15
150
151
16
152
        function getXFromContinuousIndex(index) {
17
153
            return CarouselJS.getXFromContinuousIndex(index,
18
154
                                                       realWidth,
19
155
                                                       footerItem.x,
20
156
                                                       tileWidth,
21
157
                                                       gapToMiddlePhase,
22
158
                                                       gapToEndPhase,
23
159
                                                       carousel.drawBuffer)
24
160
        }
25
161
26
151
        function itemClicked(index, delegateItem) {
162
        function itemClicked(index, delegateItem) {
27
152
            listView.currentIndex = index
163
            listView.currentIndex = index
35
153
            var x = CarouselJS.getXFromContinuousIndex(index,
164
            var x = getXFromContinuousIndex(index);
29
154
                                                       realWidth,
30
155
                                                       realContentWidth,
31
156
                                                       tileWidth,
32
157
                                                       gapToMiddlePhase,
33
158
                                                       gapToEndPhase,
34
159
                                                       carousel.drawBuffer)
36
160
165
37
161
            if (Math.abs(x - contentX) < 1 && delegateItem !== undefined) {
166
            if (Math.abs(x - contentX) < 1 && delegateItem !== undefined) {
38
162
                /* We're clicking the selected item and
167
                /* We're clicking the selected item and
39
@@ -174,13 +179,7 @@
40
174
        }
179
        }
41
175
180
42
176
        function itemPressAndHold(index, delegateItem) {
181
        function itemPressAndHold(index, delegateItem) {
50
177
            var x = CarouselJS.getXFromContinuousIndex(index,
182
            var x = getXFromContinuousIndex(index);
44
178
                                                       realWidth,
45
179
                                                       realContentWidth,
46
180
                                                       tileWidth,
47
181
                                                       gapToMiddlePhase,
48
182
                                                       gapToEndPhase,
49
183
                                                       carousel.drawBuffer);
51
184
183
52
185
            if (Math.abs(x - contentX) < 1 && delegateItem !== undefined) {
184
            if (Math.abs(x - contentX) < 1 && delegateItem !== undefined) {
53
186
                /* We're pressAndHold the selected item and
185
                /* We're pressAndHold the selected item and
54
@@ -209,22 +208,17 @@
55
209
            newContentX = disabledNewContentX
208
            newContentX = disabledNewContentX
56
210
        }
209
        }
57
211
        onMovementEnded: {
210
        onMovementEnded: {
59
212
            if (realContentX > 0 && realContentX < realContentWidth - realWidth)
211
            if (realContentX > 0)
60
213
                stepAnimation.start()
212
                stepAnimation.start()
61
214
        }
213
        }
62
215
214
63
216
        SmoothedAnimation {
215
        SmoothedAnimation {
64
217
            id: stepAnimation
216
            id: stepAnimation
65
217
            objectName: "stepAnimation"
66
218
218
67
219
            target: listView
219
            target: listView
68
220
            property: "contentX"
220
            property: "contentX"
76
221
            to: CarouselJS.getXFromContinuousIndex(listView.selectedIndex,
221
            to: listView.getXFromContinuousIndex(listView.selectedIndex)
70
222
                                                   listView.realWidth,
71
223
                                                   listView.realContentWidth,
72
224
                                                   listView.tileWidth,
73
225
                                                   listView.gapToMiddlePhase,
74
226
                                                   listView.gapToEndPhase,
75
227
                                                   carousel.drawBuffer)
77
228
            duration: 450
222
            duration: 450
78
229
            velocity: 200
223
            velocity: 200
79
230
            easing.type: Easing.InOutQuad
224
            easing.type: Easing.InOutQuad
80
231
225
81
=== modified file 'tests/qmltests/Components/tst_Carousel.qml'
82
--- tests/qmltests/Components/tst_Carousel.qml	2014-03-27 16:54:32 +0000
83
+++ tests/qmltests/Components/tst_Carousel.qml	2014-04-11 08:33:00 +0000
84
@@ -18,6 +18,7 @@
85
18
import QtTest 1.0
18
import QtTest 1.0
86
19
import "../../../qml/Components/"
19
import "../../../qml/Components/"
87
20
import "../../../qml/Components/carousel.js" as Carousel
20
import "../../../qml/Components/carousel.js" as Carousel
88
21
import Unity.Test 0.1 as UT
89
21
22
90
22
Item {
23
Item {
91
23
    width: 700
24
    width: 700
92
@@ -32,12 +33,13 @@
93
32
        property int destroyedDelegates: 0
33
        property int destroyedDelegates: 0
94
33
34
95
34
        itemComponent: Rectangle {
35
        itemComponent: Rectangle {
96
36
            border.color: "black"
97
35
            color: "red"
37
            color: "red"
98
36
            Component.onCompleted: carousel.createdDelegates++
38
            Component.onCompleted: carousel.createdDelegates++
99
37
            Component.onDestruction: carousel.destroyedDelegates++
39
            Component.onDestruction: carousel.destroyedDelegates++
100
38
        }
40
        }
101
39
    }
41
    }
103
40
    TestCase {
42
    UT.UnityTestCase {
104
41
        id: root
43
        id: root
105
42
        name: "Carousel"
44
        name: "Carousel"
106
43
        when: windowShown
45
        when: windowShown
107
@@ -55,8 +57,11 @@
108
55
        property real kGapEnd: kMiddleIndex * (1 - gapToEndPhase / gapToMiddlePhase)
57
        property real kGapEnd: kMiddleIndex * (1 - gapToEndPhase / gapToMiddlePhase)
109
56
        property real kXBeginningEnd: 1 / tileWidth + kMiddleIndex / gapToMiddlePhase
58
        property real kXBeginningEnd: 1 / tileWidth + kMiddleIndex / gapToMiddlePhase
110
57
59
113
58
        function test_onlyNeededItemsCreated() {
60
        // This test needs to run first since it tests a corner case condition
114
59
            compare(carousel.createdDelegates, 10);
61
        // to where the carousel is just being created
115
62
        // That is why it has a 1 in the name
116
63
        function test_1onlyNeededItemsCreated() {
117
64
            tryCompare(carousel, "createdDelegates", 10);
118
60
            compare(carousel.destroyedDelegates, 0);
65
            compare(carousel.destroyedDelegates, 0);
119
61
        }
66
        }
120
62
67
121
@@ -216,5 +221,24 @@
122
216
                                                    data.maxTranslation)
221
                                                    data.maxTranslation)
123
217
            compare(scale, data.result)
222
            compare(scale, data.result)
124
218
        }
223
        }
125
224
126
225
        function test_lastItemXPosition() {
127
226
            var carouselList = findChild(carousel, "listView");
128
227
            var stepAnimation = findInvisibleChild(carouselList, "stepAnimation");
129
228
            var stepDiff = 0;
130
229
            stepAnimation.onRunningChanged.connect(function() { if (stepAnimation.running) stepDiff = Math.abs(carouselList.contentX - stepAnimation.to); })
131
230
            var overshootOnce = false;
132
231
            while (!overshootOnce) {
133
232
                overshootOnce = carouselList.realContentX > carouselList.realContentWidth - carouselList.realWidth;
134
233
                mouseFlick(carousel, carousel.width - units.gu(1),
135
234
                                            carousel.height / 2,
136
235
                                            units.gu(2),
137
236
                                            carousel.height / 2);
138
237
                tryCompare(carouselList, "moving", false);
139
238
            }
140
239
            verify(stepDiff < 1);
141
240
            var x = carouselList.getXFromContinuousIndex(carousel.model - 1);
142
241
            verify(Math.abs(x - carouselList.contentX) < 1);
143
242
        }
144
219
    }
243
    }
145
220
}
244
}
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2014-04-11
Andrea Cimitan (community)			Approve on 2014-04-11
Michał Sawicz		2014-04-04	Needs Information on 2014-04-09
Review via email: mp+214230@code.launchpad.net