git.iko.soy/unity8
on xenial help sign in
Bring back the simple title code (no button needed)
ed49d9fAlbert Astals Cid
qml/Dash/DashPageHeader.qml+1−23
compare with xenial
unifiedsplit
@@ -276,6 +276,7 @@ Item {
276 property color panelColor: background.topColor
276 property color panelColor: background.topColor
277 panelForegroundColor: config.foregroundColor
277 panelForegroundColor: config.foregroundColor
278 config: PageHeadConfiguration {
278 config: PageHeadConfiguration {
279+ title: root.title
279 foregroundColor: root.scopeStyle ? root.scopeStyle.headerForeground : theme.palette.normal.baseText
280 foregroundColor: root.scopeStyle ? root.scopeStyle.headerForeground : theme.palette.normal.baseText
280 backAction: Action {
281 backAction: Action {
281 iconName: backIsClose ? "close" : "back"
282 iconName: backIsClose ? "close" : "back"
@@ -316,29 +317,6 @@ Item {
316 onTriggered: root.favoriteClicked()
317 onTriggered: root.favoriteClicked()
317 }
318 }
318 ]
319 ]
319−
320− contents: Label {
321− visible: header.contents === null
322− LayoutMirroring.enabled: Qt.application.layoutDirection == Qt.RightToLeft
323− anchors {
324− left: parent.left
325− right: parent.right
326− verticalCenter: parent.verticalCenter
327− }
328− text: root.title
329− font.weight: header.fontWeight
330− fontSize: header.fontSize
331− color: header.panelForegroundColor
332− elide: Text.ElideRight
333− AbstractButton {
334− anchors.fill: parent
335− enabled: root.searchEntryEnabled
336− onClicked: {
337− headerContainer.showSearch = true;
338− searchTextField.forceActiveFocus();
339− }
340− }
341− }
342 }
320 }
343
321
344 property var contents: null
322 property var contents: null