git.iko.soy/unity8
on xenial help sign in
warnings--
commit8533b0d889a93d44d2aa7b884412716252343198 authorMichael Zanetti <michael.zanetti@canonical.com> dateTue 15 Oct 2013, 14:50 (13 years ago) parentb9b3c3e
2 files changed+3−3
compare with xenial
unifiedsplit
Components/Carousel.qml+2−2 Dash/GenericScopeView.qml+1−1
Components/Carousel.qml+2−2
@@ -158,7 +158,7 @@ Item {
158158 gapToEndPhase,
159159 carousel.drawBuffer)
160160
161− if (Math.abs(x - contentX) < 1) {
161+ if (Math.abs(x - contentX) < 1 && delegateItem !== undefined) {
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. */
@@ -182,7 +182,7 @@ Item {
182182 gapToEndPhase,
183183 carousel.drawBuffer);
184184
185− if (Math.abs(x - contentX) < 1) {
185+ if (Math.abs(x - contentX) < 1 && delegateItem !== undefined) {
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. */
Dash/GenericScopeView.qml+1−1
@@ -484,7 +484,7 @@ ScopeView {
484484 anchors {
485485 top: previewListView.bottom
486486 left: parent.left
487− leftMargin: previewListView.categoryDelegate.currentItem ?
487+ leftMargin: previewListView.categoryDelegate !== undefined && previewListView.categoryDelegate.currentItem ?
488488 previewListView.categoryDelegate.currentItem.center + (-width + margins) / 2 : 0
489489
490490 Behavior on leftMargin {