git.iko.soy/unity8
on xenial help sign in
rename afterLineChildItem, name wasn't great
1129e29Albert Astals
qml/Components/PageHeader.qml+5−5
compare with xenial
unifiedsplit
@@ -28,13 +28,13 @@ Item {
28 property ListModel searchHistory
28 property ListModel searchHistory
29 property var scope: null
29 property var scope: null
30 property alias childItem: itemContainer.children
30 property alias childItem: itemContainer.children
31− property alias afterLineChildItem: afterLineContainer.children
31+ property alias bottomItem: bottomContainer.children
32 property alias showBackButton: backButton.visible
32 property alias showBackButton: backButton.visible
33
33
34 signal backClicked
34 signal backClicked
35
35
36− height: header.height + units.gu(2) + afterLineContainer.height
36+ height: header.height + units.gu(2) + bottomContainer.height
37− implicitHeight: header.height + units.gu(2) + afterLineContainer.height
37+ implicitHeight: header.height + units.gu(2) + bottomContainer.height
38
38
39 function triggerSearch() {
39 function triggerSearch() {
40 if (searchEntryEnabled) searchField.forceActiveFocus()
40 if (searchEntryEnabled) searchField.forceActiveFocus()
@@ -406,14 +406,14 @@ Item {
406 top: header.bottom
406 top: header.bottom
407 left: parent.left
407 left: parent.left
408 right: parent.right
408 right: parent.right
409− bottom: afterLineContainer.top
409+ bottom: bottomContainer.top
410 }
410 }
411
411
412 source: "graphics/PageHeaderBaseDivider.sci"
412 source: "graphics/PageHeaderBaseDivider.sci"
413 }
413 }
414
414
415 Item {
415 Item {
416− id: afterLineContainer
416+ id: bottomContainer
417
417
418 anchors.bottom: parent.bottom
418 anchors.bottom: parent.bottom
419 width: parent.width
419 width: parent.width
qml/Dash/DashContent.qml+1−1
@@ -218,7 +218,7 @@ Item {
218 }
218 }
219 }
219 }
220
220
221− afterLineChildItem: DashDepartments {
221+ bottomItem: DashDepartments {
222 scope: dashContentList.currentItem ? dashContentList.currentItem.theScope : null
222 scope: dashContentList.currentItem ? dashContentList.currentItem.theScope : null
223 width: parent.width <= units.gu(60) ? parent.width : units.gu(40)
223 width: parent.width <= units.gu(60) ? parent.width : units.gu(40)
224 anchors.right: parent.right
224 anchors.right: parent.right
qml/Dash/ScopeItem.qml+1−1
@@ -84,7 +84,7 @@ Item {
84 elide: Text.ElideRight
84 elide: Text.ElideRight
85 }
85 }
86
86
87− afterLineChildItem: DashDepartments {
87+ bottomItem: DashDepartments {
88 scope: root.scope
88 scope: root.scope
89 width: parent.width <= units.gu(60) ? parent.width : units.gu(40)
89 width: parent.width <= units.gu(60) ? parent.width : units.gu(40)
90 anchors.right: parent.right
90 anchors.right: parent.right