on xenial help sign in
Rename parentList to parentFlickable
commit03f8fb16c5787d41a912bd2c8a892e53f7e9342c authorAlbert Astals Cid <albert.astals@canonical.com> dateThu 26 Nov 2015, 17:36 (11 years ago) parentb8d7afd
4 files changed+15−15
qml/Dash/Previews/Preview.qml+1−1 qml/Dash/Previews/PreviewRatingDisplay.qml+9−9 qml/Dash/Previews/PreviewWidget.qml+2−2 qml/Dash/Previews/PreviewWidgetFactory.qml+3−3
qml/Dash/Previews/Preview.qml+1−1
@@ -90,7 +90,7 @@ Item {
9090 widgetData: model.properties
9191 isCurrentPreview: root.isCurrent
9292 scopeStyle: root.scopeStyle
93− parentList: column
93+ parentFlickable: column
9494
9595 anchors {
9696 left: parent.left
qml/Dash/Previews/PreviewRatingDisplay.qml+9−9
@@ -41,10 +41,10 @@ PreviewWidget {
4141 implicitHeight: childrenRect.height
4242
4343 onIsCurrentPreviewChanged: ratingsList.updateRanges();
44− onParentListChanged: ratingsList.updateRanges();
44+ onParentFlickableChanged: ratingsList.updateRanges();
4545
4646 Connections {
47− target: parentList
47+ target: parentFlickable
4848 onOriginYChanged: ratingsList.updateRanges();
4949 onContentYChanged: ratingsList.updateRanges();
5050 onHeightChanged: ratingsList.updateRanges();
@@ -78,19 +78,19 @@ PreviewWidget {
7878
7979 function updateRanges() {
8080 var baseItem = root.parent;
81− if (!parentList || !baseItem) {
81+ if (!parentFlickable || !baseItem) {
8282 ratingsList.displayMarginBeginning = 0;
8383 ratingsList.displayMarginEnd = 0;
8484 return;
8585 }
8686
87− if (parentList.moving) {
87+ if (parentFlickable.moving) {
8888 // Do not update the range if we are overshooting up or down, since we'll come back
8989 // to the stable position and delete/create items without any reason
90− if (parentList.contentY < parentList.originY) {
90+ if (parentFlickable.contentY < parentFlickable.originY) {
9191 return;
92− } else if (parentList.contentHeight - parentList.originY > parentList.height &&
93− parentList.contentY + parentList.height > parentList.contentHeight) {
92+ } else if (parentFlickable.contentHeight - parentFlickable.originY > parentFlickable.height &&
93+ parentFlickable.contentY + parentFlickable.height > parentFlickable.contentHeight) {
9494 return;
9595 }
9696 }
@@ -106,8 +106,8 @@ PreviewWidget {
106106 // Ideally we would also use displayMarginBeginning
107107 // so that delegates at the beginning get destroyed but that causes issues with
108108 // listview and is not really necessary to provide the better experience we're after
109− var itemYOnViewPort = baseItem.y - parentList.contentY;
110− var displayMarginEnd = -ratingsList.contentHeight + parentList.height - itemYOnViewPort;
109+ var itemYOnViewPort = baseItem.y - parentFlickable.contentY;
110+ var displayMarginEnd = -ratingsList.contentHeight + parentFlickable.height - itemYOnViewPort;
111111 displayMarginEnd = -Math.max(-displayMarginEnd, 0);
112112 displayMarginEnd = -Math.min(-displayMarginEnd, ratingsList.contentHeight);
113113 displayMarginEnd = Math.round(displayMarginEnd);
qml/Dash/Previews/PreviewWidget.qml+2−2
@@ -37,8 +37,8 @@ Item {
3737 //! Set margins width.
3838 property real widgetMargins: units.gu(1)
3939
40− /// The parent (vertical) list this widget is in (if any)
41− property var parentList: null
40+ /// The parent (vertical) flickable this widget is in (if any)
41+ property var parentFlickable: null
4242
4343 /*! \brief This signal should be emitted when a preview action was triggered.
4444 *
qml/Dash/Previews/PreviewWidgetFactory.qml+3−3
@@ -43,8 +43,8 @@ Loader {
4343 //! Set margins width.
4444 property real widgetMargins: status === Loader.Ready ? item.widgetMargins : units.gu(1)
4545
46− /// The parent (vertical) list this widget is in (if any)
47− property var parentList: null
46+ /// The parent (vertical) flickable this widget is in (if any)
47+ property var parentFlickable: null
4848
4949 //! Triggered signal forwarded from the widgets.
5050 signal triggered(string widgetId, string actionId, var data)
@@ -85,7 +85,7 @@ Loader {
8585 item.isCurrentPreview = Qt.binding(function() { return root.isCurrentPreview } )
8686 item.expanded = Qt.binding(function() { return root.expanded } )
8787 item.scopeStyle = Qt.binding(function() { return root.scopeStyle } )
88− item.parentList = Qt.binding(function() { return root.parentList } )
88+ item.parentFlickable = Qt.binding(function() { return root.parentFlickable } )
8989 }
9090
9191 Connections {