git.iko.soy/unity8
on xenial help sign in
Merge
f41454cAlbert Astals Cid
qml/Dash/DashPageHeader.qml+1−15
compare with xenial
unifiedsplit
@@ -296,6 +296,7 @@ Item {
296 property color panelColor: background.topColor
296 property color panelColor: background.topColor
297 panelForegroundColor: config.foregroundColor
297 panelForegroundColor: config.foregroundColor
298 config: PageHeadConfiguration {
298 config: PageHeadConfiguration {
299+ title: root.title
299 foregroundColor: root.scopeStyle ? root.scopeStyle.headerForeground : theme.palette.normal.baseText
300 foregroundColor: root.scopeStyle ? root.scopeStyle.headerForeground : theme.palette.normal.baseText
300 backAction: Action {
301 backAction: Action {
301 iconName: backIsClose ? "close" : "back"
302 iconName: backIsClose ? "close" : "back"
@@ -336,21 +337,6 @@ Item {
336 onTriggered: root.favoriteClicked()
337 onTriggered: root.favoriteClicked()
337 }
338 }
338 ]
339 ]
339−
340− contents: Label {
341− visible: header.contents === null
342− LayoutMirroring.enabled: Qt.application.layoutDirection == Qt.RightToLeft
343− anchors {
344− left: parent.left
345− right: parent.right
346− verticalCenter: parent.verticalCenter
347− }
348− text: root.title
349− font.weight: header.fontWeight
350− fontSize: header.fontSize
351− color: header.panelForegroundColor
352− elide: Text.ElideRight
353− }
354 }
340 }
355
341
356 property var contents: null
342 property var contents: null