git.iko.soy/unity8
on xenial help sign in
cleanup
bfd939cMichael Zanetti
Components/Carousel.qml+2−2
compare with xenial
unifiedsplit
@@ -162,7 +162,7 @@ Item {
162 /* We're clicking the selected item and
162 /* We're clicking the selected item and
163 we're in the neighbourhood of radius 1 pixel from it.
163 we're in the neighbourhood of radius 1 pixel from it.
164 Let's emit the clicked signal. */
164 Let's emit the clicked signal. */
165− carousel.clicked(index, listView.model, 0)
165+ carousel.clicked(index, listView.model, delegateItem.y)
166 return
166 return
167 }
167 }
168
168
@@ -186,7 +186,7 @@ Item {
186 /* We're pressAndHold the selected item and
186 /* We're pressAndHold the selected item and
187 we're in the neighbourhood of radius 1 pixel from it.
187 we're in the neighbourhood of radius 1 pixel from it.
188 Let's emit the pressAndHold signal. */
188 Let's emit the pressAndHold signal. */
189− carousel.pressAndHold(index, listView.model, 0);
189+ carousel.pressAndHold(index, listView.model, delegateItem.y);
190 return;
190 return;
191 }
191 }
192
192
Dash/GenericScopeView.qml−2
@@ -392,7 +392,6 @@ ScopeView {
392 }
392 }
393 var itemY = categoryView.contentItem.mapFromItem(categoryDelegate.currentItem).y;
393 var itemY = categoryView.contentItem.mapFromItem(categoryDelegate.currentItem).y;
394 var newContentY = itemY - effect.positionPx - categoryDelegate.verticalSpacing;
394 var newContentY = itemY - effect.positionPx - categoryDelegate.verticalSpacing;
395− print("newContentY", newContentY, categoryView.originY);
396 var effectAdjust = effect.positionPx;
395 var effectAdjust = effect.positionPx;
397 if (newContentY < 0) {
396 if (newContentY < 0) {
398 effectAdjust += newContentY;
397 effectAdjust += newContentY;
@@ -414,7 +413,6 @@ ScopeView {
414 if (open) {
413 if (open) {
415 onScreen = true;
414 onScreen = true;
416 categoryDelegate.highlightIndex = currentIndex;
415 categoryDelegate.highlightIndex = currentIndex;
417− newContentY = categoryView.contentY;
418 } else {
416 } else {
419 // Cancel any pending preview requests or actions
417 // Cancel any pending preview requests or actions
420 if (previewListView.currentItem.previewData !== undefined) {
418 if (previewListView.currentItem.previewData !== undefined) {