3be0f91 · unity8 · git.iko.soy

git.iko.soy/unity8

Merge lp:~aacid/unity8/carouselLastItemClick

commit3be0f91b8a5f19e8ec4763070df6ceca1dfb67fe authorAlbert Astals <albert.astals@canonical.com> dateMon 14 Apr 2014, 11:22 (13 years ago) parentcff0a2c 5e94102

2 files changed+40−22

compare with xenial

unifiedsplit

qml/Components/Carousel.qml+13−19 tests/qmltests/Components/tst_Carousel.qml+27−3

qml/Components/Carousel.qml+13−19

@@ -75,6 +75,7 @@ Item {

7575 The scaling of the items is controlled by the variable continuousIndex, described below. */

7676 ListView {

7777 id: listView

78+ objectName: "listView"

7879

7980 property int highlightIndex: -1

8081 property real minimumTileWidth: 0

@@ -148,15 +149,19 @@ Item {

148149 maximumFlickVelocity: Math.max(2500 * Math.pow(realWidth / referenceWidth, 1.5), 2500) // 2500 is platform default

149150 orientation: ListView.Horizontal

150151

151− function itemClicked(index, delegateItem) {

152− listView.currentIndex = index

153− var x = CarouselJS.getXFromContinuousIndex(index,

152+ function getXFromContinuousIndex(index) {

153+ return CarouselJS.getXFromContinuousIndex(index,

154154 realWidth,

155− realContentWidth,

155+ footerItem.x,

156156 tileWidth,

157157 gapToMiddlePhase,

158158 gapToEndPhase,

159159 carousel.drawBuffer)

160+ }

161+

162+ function itemClicked(index, delegateItem) {

163+ listView.currentIndex = index

164+ var x = getXFromContinuousIndex(index);

160165

161166 if (Math.abs(x - contentX) < 1 && delegateItem !== undefined) {

162167 /* We're clicking the selected item and

@@ -174,13 +179,7 @@ Item {

174179 }

175180

176181 function itemPressAndHold(index, delegateItem) {

177− var x = CarouselJS.getXFromContinuousIndex(index,

178− realWidth,

179− realContentWidth,

180− tileWidth,

181− gapToMiddlePhase,

182− gapToEndPhase,

183− carousel.drawBuffer);

182+ var x = getXFromContinuousIndex(index);

184183

185184 if (Math.abs(x - contentX) < 1 && delegateItem !== undefined) {

186185 /* We're pressAndHold the selected item and

@@ -209,22 +208,17 @@ Item {

209208 newContentX = disabledNewContentX

210209 }

211210 onMovementEnded: {

212− if (realContentX > 0 && realContentX < realContentWidth - realWidth)

211+ if (realContentX > 0)

213212 stepAnimation.start()

214213 }

215214

216215 SmoothedAnimation {

217216 id: stepAnimation

217+ objectName: "stepAnimation"

218218

219219 target: listView

220220 property: "contentX"

221− to: CarouselJS.getXFromContinuousIndex(listView.selectedIndex,

222− listView.realWidth,

223− listView.realContentWidth,

224− listView.tileWidth,

225− listView.gapToMiddlePhase,

226− listView.gapToEndPhase,

227− carousel.drawBuffer)

221+ to: listView.getXFromContinuousIndex(listView.selectedIndex)

228222 duration: 450

229223 velocity: 200

230224 easing.type: Easing.InOutQuad

tests/qmltests/Components/tst_Carousel.qml+27−3

@@ -18,6 +18,7 @@ import QtQuick 2.0

1818import QtTest 1.0

1919import "../../../qml/Components/"

2020import "../../../qml/Components/carousel.js" as Carousel

21+import Unity.Test 0.1 as UT

2122

2223Item {

2324 width: 700

@@ -34,13 +35,14 @@ Item {

3435 itemComponent: BaseCarouselDelegate {

3536 Rectangle {

3637 anchors.fill: parent

38+ border.color: "black"

3739 color: "red"

3840 Component.onCompleted: carousel.createdDelegates++

3941 Component.onDestruction: carousel.destroyedDelegates++

4042 }

4143 }

4244 }

43− TestCase {

45+ UT.UnityTestCase {

4446 id: root

4547 name: "Carousel"

4648 when: windowShown

@@ -58,8 +60,11 @@ Item {

5860 property real kGapEnd: kMiddleIndex * (1 - gapToEndPhase / gapToMiddlePhase)

5961 property real kXBeginningEnd: 1 / tileWidth + kMiddleIndex / gapToMiddlePhase

6062

61− function test_onlyNeededItemsCreated() {

62− compare(carousel.createdDelegates, 10);

63+ // This test needs to run first since it tests a corner case condition

64+ // to where the carousel is just being created

65+ // That is why it has a 1 in the name

66+ function test_1onlyNeededItemsCreated() {

67+ tryCompare(carousel, "createdDelegates", 10);

6368 compare(carousel.destroyedDelegates, 0);

6469 }

6570

@@ -219,5 +224,24 @@ Item {

219224 data.maxTranslation)

220225 compare(scale, data.result)

221226 }

227+

228+ function test_lastItemXPosition() {

229+ var carouselList = findChild(carousel, "listView");

230+ var stepAnimation = findInvisibleChild(carouselList, "stepAnimation");

231+ var stepDiff = 0;

232+ stepAnimation.onRunningChanged.connect(function() { if (stepAnimation.running) stepDiff = Math.abs(carouselList.contentX - stepAnimation.to); })

233+ var overshootOnce = false;

234+ while (!overshootOnce) {

235+ overshootOnce = carouselList.realContentX > carouselList.realContentWidth - carouselList.realWidth;

236+ mouseFlick(carousel, carousel.width - units.gu(1),

237+ carousel.height / 2,

238+ units.gu(2),

239+ carousel.height / 2);

240+ tryCompare(carouselList, "moving", false);

241+ }

242+ verify(stepDiff < 1);

243+ var x = carouselList.getXFromContinuousIndex(carousel.model - 1);

244+ verify(Math.abs(x - carouselList.contentX) < 1);

245+ }

222246 }

223247}