@@ -14,8 +14,8 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.1
18−import Ubuntu.Components 0.1
17+import QtQuick 2.2
18+import Ubuntu.Components 1.1
1919
2020Item {
2121 id: root
@@ -35,9 +35,8 @@ Item {
3535
3636 property real lateralPosition: -1
3737 onLateralPositionChanged: {
38− if (currentItem && !enableLateralChanges) return;
38+ if (currentItem || !enableLateralChanges) return;
3939 updateItemFromLateralPosition(lateralPosition);
40− highlight.updateHighlightOffset();
4140 }
4241
4342 function updateItemFromLateralPosition(lateralPosition) {
@@ -54,9 +53,10 @@ Item {
5453 var bufferExceeded = false;
5554
5655 if (proposedItem !== currentItem) {
56+ // Proposed item is not directly adjacent to current?
5757 if (Math.abs(currentItem.ownIndex - currentItem.ownIndex) > 1) {
5858 bufferExceeded = true;
59− } else {
59+ } else { // no
6060 var currentItemLateralPosition = root.mapToItem(proposedItem, lateralPosition, 0).x;
6161
6262 // Is the distance into proposed item greater than max buffer?
@@ -103,7 +103,7 @@ Item {
103103 currentItem = item;
104104 } else {
105105 // Select default item.
106− var searchIndex = lateralPosition > width ? repeater.count-1 : 0;
106+ var searchIndex = lateralPosition > width ? repeater.count - 1 : 0;
107107
108108 for (var i = 0; i < row.children.length; i++) {
109109 if (row.children[i].hasOwnProperty("ownIndex") && row.children[i].ownIndex === searchIndex) {
@@ -170,7 +170,7 @@ Item {
170170 anchors.bottom: row.bottom
171171 height: units.dp(2)
172172 color: root.hightlightColor
173− visible: root.currentItem !== null
173+ visible: currentItem !== null
174174 opacity: 0.0
175175
176176 width: currentItem ? currentItem.width : 0
@@ -181,31 +181,34 @@ Item {
181181
182182 // micromovements of the highlight line when user moves the finger across the items while pulling
183183 // the handle downwards.
184− function updateHighlightOffset() {
185− if (!currentItem || lateralPosition == -1) {
186− highlightCenterOffset = 0;
187− return;
188− }
184+ Connections {
185+ target: root
186+ onLateralPositionChanged: {
187+ if (!currentItem || lateralPosition == -1) {
188+ highlight.highlightCenterOffset = 0;
189+ return;
190+ }
191+ if (!enableLateralChanges) return;
189192
190− var itemMapped = root.mapToItem(currentItem, lateralPosition, 0);
193+ var itemMapped = root.mapToItem(currentItem, lateralPosition, 0);
191194
192− var distanceFromCenter = itemMapped.x - currentItem.width / 2;
193− if (distanceFromCenter > 0) {
194− distanceFromCenter = Math.max(0, distanceFromCenter-currentItem.width / 8);
195− } else {
196− distanceFromCenter = Math.min(0, distanceFromCenter+currentItem.width / 8);
197− }
195+ var distanceFromCenter = itemMapped.x - currentItem.width / 2;
196+ if (distanceFromCenter > 0) {
197+ distanceFromCenter = Math.max(0, distanceFromCenter - currentItem.width / 8);
198+ } else {
199+ distanceFromCenter = Math.min(0, distanceFromCenter + currentItem.width / 8);
200+ }
198201
199− if (currentItem && currentItem.ownIndex === 0 && distanceFromCenter < 0) {
200− highlightCenterOffset = 0;
201− } else if (currentItem && currentItem.ownIndex === repeater.count-1 & distanceFromCenter > 0) {
202− highlightCenterOffset = 0;
203− } else {
204− var shiftPercentageOffset = (distanceFromCenter / (currentItem.width / 4));
205− highlightCenterOffset = shiftPercentageOffset * units.gu(1);
202+ if (currentItem && currentItem.ownIndex === 0 && distanceFromCenter < 0) {
203+ highlight.highlightCenterOffset = 0;
204+ } else if (currentItem && currentItem.ownIndex === repeater.count-1 & distanceFromCenter > 0) {
205+ highlight.highlightCenterOffset = 0;
206+ } else {
207+ highlight.highlightCenterOffset = (distanceFromCenter / (currentItem.width / 4)) * units.gu(1);
208+ }
206209 }
207−
208210 }
211+
209212 property real highlightCenterOffset: 0
210213 Behavior on highlightCenterOffset {
211214 NumberAnimation { duration: UbuntuAnimation.FastDuration; easing: UbuntuAnimation.StandardEasing }
@@ -236,7 +239,7 @@ Item {
236239 Transition {
237240 PropertyAnimation {
238241 properties: "opacity";
239− duration: UbuntuAnimation.SnapDuration;
242+ duration: UbuntuAnimation.SnapDuration
240243 easing: UbuntuAnimation.StandardEasing
241244 }
242245 }