git.iko.soy/unity8
on xenial help sign in
Rename parentList to parentFlickable
03f8fb1Albert Astals Cid
qml/Dash/Previews/Preview.qml+1−1
compare with xenial
unifiedsplit
@@ -90,7 +90,7 @@ Item {
90 widgetData: model.properties
90 widgetData: model.properties
91 isCurrentPreview: root.isCurrent
91 isCurrentPreview: root.isCurrent
92 scopeStyle: root.scopeStyle
92 scopeStyle: root.scopeStyle
93− parentList: column
93+ parentFlickable: column
94
94
95 anchors {
95 anchors {
96 left: parent.left
96 left: parent.left
qml/Dash/Previews/PreviewRatingDisplay.qml+9−9
@@ -41,10 +41,10 @@ PreviewWidget {
41 implicitHeight: childrenRect.height
41 implicitHeight: childrenRect.height
42
42
43 onIsCurrentPreviewChanged: ratingsList.updateRanges();
43 onIsCurrentPreviewChanged: ratingsList.updateRanges();
44− onParentListChanged: ratingsList.updateRanges();
44+ onParentFlickableChanged: ratingsList.updateRanges();
45
45
46 Connections {
46 Connections {
47− target: parentList
47+ target: parentFlickable
48 onOriginYChanged: ratingsList.updateRanges();
48 onOriginYChanged: ratingsList.updateRanges();
49 onContentYChanged: ratingsList.updateRanges();
49 onContentYChanged: ratingsList.updateRanges();
50 onHeightChanged: ratingsList.updateRanges();
50 onHeightChanged: ratingsList.updateRanges();
@@ -78,19 +78,19 @@ PreviewWidget {
78
78
79 function updateRanges() {
79 function updateRanges() {
80 var baseItem = root.parent;
80 var baseItem = root.parent;
81− if (!parentList || !baseItem) {
81+ if (!parentFlickable || !baseItem) {
82 ratingsList.displayMarginBeginning = 0;
82 ratingsList.displayMarginBeginning = 0;
83 ratingsList.displayMarginEnd = 0;
83 ratingsList.displayMarginEnd = 0;
84 return;
84 return;
85 }
85 }
86
86
87− if (parentList.moving) {
87+ if (parentFlickable.moving) {
88 // Do not update the range if we are overshooting up or down, since we'll come back
88 // Do not update the range if we are overshooting up or down, since we'll come back
89 // to the stable position and delete/create items without any reason
89 // to the stable position and delete/create items without any reason
90− if (parentList.contentY < parentList.originY) {
90+ if (parentFlickable.contentY < parentFlickable.originY) {
91 return;
91 return;
92− } else if (parentList.contentHeight - parentList.originY > parentList.height &&
92+ } else if (parentFlickable.contentHeight - parentFlickable.originY > parentFlickable.height &&
93− parentList.contentY + parentList.height > parentList.contentHeight) {
93+ parentFlickable.contentY + parentFlickable.height > parentFlickable.contentHeight) {
94 return;
94 return;
95 }
95 }
96 }
96 }
@@ -106,8 +106,8 @@ PreviewWidget {
106 // Ideally we would also use displayMarginBeginning
106 // Ideally we would also use displayMarginBeginning
107 // so that delegates at the beginning get destroyed but that causes issues with
107 // so that delegates at the beginning get destroyed but that causes issues with
108 // listview and is not really necessary to provide the better experience we're after
108 // listview and is not really necessary to provide the better experience we're after
109− var itemYOnViewPort = baseItem.y - parentList.contentY;
109+ var itemYOnViewPort = baseItem.y - parentFlickable.contentY;
110− var displayMarginEnd = -ratingsList.contentHeight + parentList.height - itemYOnViewPort;
110+ var displayMarginEnd = -ratingsList.contentHeight + parentFlickable.height - itemYOnViewPort;
111 displayMarginEnd = -Math.max(-displayMarginEnd, 0);
111 displayMarginEnd = -Math.max(-displayMarginEnd, 0);
112 displayMarginEnd = -Math.min(-displayMarginEnd, ratingsList.contentHeight);
112 displayMarginEnd = -Math.min(-displayMarginEnd, ratingsList.contentHeight);
113 displayMarginEnd = Math.round(displayMarginEnd);
113 displayMarginEnd = Math.round(displayMarginEnd);
qml/Dash/Previews/PreviewWidget.qml+2−2
@@ -37,8 +37,8 @@ Item {
37 //! Set margins width.
37 //! Set margins width.
38 property real widgetMargins: units.gu(1)
38 property real widgetMargins: units.gu(1)
39
39
40− /// The parent (vertical) list this widget is in (if any)
40+ /// The parent (vertical) flickable this widget is in (if any)
41− property var parentList: null
41+ property var parentFlickable: null
42
42
43 /*! \brief This signal should be emitted when a preview action was triggered.
43 /*! \brief This signal should be emitted when a preview action was triggered.
44 *
44 *
qml/Dash/Previews/PreviewWidgetFactory.qml+3−3
@@ -43,8 +43,8 @@ Loader {
43 //! Set margins width.
43 //! Set margins width.
44 property real widgetMargins: status === Loader.Ready ? item.widgetMargins : units.gu(1)
44 property real widgetMargins: status === Loader.Ready ? item.widgetMargins : units.gu(1)
45
45
46− /// The parent (vertical) list this widget is in (if any)
46+ /// The parent (vertical) flickable this widget is in (if any)
47− property var parentList: null
47+ property var parentFlickable: null
48
48
49 //! Triggered signal forwarded from the widgets.
49 //! Triggered signal forwarded from the widgets.
50 signal triggered(string widgetId, string actionId, var data)
50 signal triggered(string widgetId, string actionId, var data)
@@ -85,7 +85,7 @@ Loader {
85 item.isCurrentPreview = Qt.binding(function() { return root.isCurrentPreview } )
85 item.isCurrentPreview = Qt.binding(function() { return root.isCurrentPreview } )
86 item.expanded = Qt.binding(function() { return root.expanded } )
86 item.expanded = Qt.binding(function() { return root.expanded } )
87 item.scopeStyle = Qt.binding(function() { return root.scopeStyle } )
87 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 } )
89 }
89 }
90
90
91 Connections {
91 Connections {