on xenial help sign in
rename afterLineChildItem, name wasn't great
commit1129e290c050f05b03447e2d0019d0eb80a7f8f6 authorAlbert Astals <albert.astals@canonical.com> dateTue 17 Jun 2014, 16:08 (12 years ago) parentc8292ec
3 files changed+7−7
qml/Components/PageHeader.qml+5−5 qml/Dash/DashContent.qml+1−1 qml/Dash/ScopeItem.qml+1−1
qml/Components/PageHeader.qml+5−5
@@ -28,13 +28,13 @@ Item {
2828 property ListModel searchHistory
2929 property var scope: null
3030 property alias childItem: itemContainer.children
31− property alias afterLineChildItem: afterLineContainer.children
31+ property alias bottomItem: bottomContainer.children
3232 property alias showBackButton: backButton.visible
3333
3434 signal backClicked
3535
36− height: header.height + units.gu(2) + afterLineContainer.height
37− implicitHeight: header.height + units.gu(2) + afterLineContainer.height
36+ height: header.height + units.gu(2) + bottomContainer.height
37+ implicitHeight: header.height + units.gu(2) + bottomContainer.height
3838
3939 function triggerSearch() {
4040 if (searchEntryEnabled) searchField.forceActiveFocus()
@@ -406,14 +406,14 @@ Item {
406406 top: header.bottom
407407 left: parent.left
408408 right: parent.right
409− bottom: afterLineContainer.top
409+ bottom: bottomContainer.top
410410 }
411411
412412 source: "graphics/PageHeaderBaseDivider.sci"
413413 }
414414
415415 Item {
416− id: afterLineContainer
416+ id: bottomContainer
417417
418418 anchors.bottom: parent.bottom
419419 width: parent.width
qml/Dash/DashContent.qml+1−1
@@ -218,7 +218,7 @@ Item {
218218 }
219219 }
220220
221− afterLineChildItem: DashDepartments {
221+ bottomItem: DashDepartments {
222222 scope: dashContentList.currentItem ? dashContentList.currentItem.theScope : null
223223 width: parent.width <= units.gu(60) ? parent.width : units.gu(40)
224224 anchors.right: parent.right
qml/Dash/ScopeItem.qml+1−1
@@ -84,7 +84,7 @@ Item {
8484 elide: Text.ElideRight
8585 }
8686
87− afterLineChildItem: DashDepartments {
87+ bottomItem: DashDepartments {
8888 scope: root.scope
8989 width: parent.width <= units.gu(60) ? parent.width : units.gu(40)
9090 anchors.right: parent.right