git.iko.soy/unity8
on xenial help sign in
cleanup
commitbfd939cea8d6b48dd5823f97741988f1444d8b28 authorMichael Zanetti <michael.zanetti@canonical.com> dateTue 15 Oct 2013, 14:40 (13 years ago) parentfe249d3
2 files changed+2−4
compare with xenial
unifiedsplit
Components/Carousel.qml+2−2 Dash/GenericScopeView.qml−2
Components/Carousel.qml+2−2
@@ -162,7 +162,7 @@ Item {
162162 /* We're clicking the selected item and
163163 we're in the neighbourhood of radius 1 pixel from it.
164164 Let's emit the clicked signal. */
165− carousel.clicked(index, listView.model, 0)
165+ carousel.clicked(index, listView.model, delegateItem.y)
166166 return
167167 }
168168
@@ -186,7 +186,7 @@ Item {
186186 /* We're pressAndHold the selected item and
187187 we're in the neighbourhood of radius 1 pixel from it.
188188 Let's emit the pressAndHold signal. */
189− carousel.pressAndHold(index, listView.model, 0);
189+ carousel.pressAndHold(index, listView.model, delegateItem.y);
190190 return;
191191 }
192192
Dash/GenericScopeView.qml−2
@@ -392,7 +392,6 @@ ScopeView {
392392 }
393393 var itemY = categoryView.contentItem.mapFromItem(categoryDelegate.currentItem).y;
394394 var newContentY = itemY - effect.positionPx - categoryDelegate.verticalSpacing;
395− print("newContentY", newContentY, categoryView.originY);
396395 var effectAdjust = effect.positionPx;
397396 if (newContentY < 0) {
398397 effectAdjust += newContentY;
@@ -414,7 +413,6 @@ ScopeView {
414413 if (open) {
415414 onScreen = true;
416415 categoryDelegate.highlightIndex = currentIndex;
417− newContentY = categoryView.contentY;
418416 } else {
419417 // Cancel any pending preview requests or actions
420418 if (previewListView.currentItem.previewData !== undefined) {