on xenial help sign in
Merge
bb82e44Albert Astals Cid
qml/Dash/PageHeader.qml+2−1
@@ -342,6 +342,7 @@ Item {
342 ]
342 ]
343
343
344 contents: Label {
344 contents: Label {
345+ visible: header.contents === null
345 LayoutMirroring.enabled: Qt.application.layoutDirection == Qt.RightToLeft
346 LayoutMirroring.enabled: Qt.application.layoutDirection == Qt.RightToLeft
346 anchors {
347 anchors {
347 left: parent.left
348 left: parent.left
@@ -351,7 +352,7 @@ Item {
351 text: header.title
352 text: header.title
352 font.weight: header.fontWeight
353 font.weight: header.fontWeight
353 fontSize: header.fontSize
354 fontSize: header.fontSize
354− color: header.titleColor
355+ color: header.panelForegroundColor
355 elide: Text.ElideRight
356 elide: Text.ElideRight
356 AbstractButton {
357 AbstractButton {
357 anchors.fill: parent
358 anchors.fill: parent