on xenial help sign in
Merge lp:~aacid/unity8/new-scopes-header-fix
commit5fc6641155bc86275b256ee542a34d295130ade2 authorAlbert Astals <albert.astals@canonical.com> dateThu 13 Feb 2014, 15:09 (13 years ago) parent5ccacb17c95598
2 files changed+5−3
qml/Dash/Card.qml+1 qml/Dash/CardHeader.qml+4−3
qml/Dash/Card.qml+1
@@ -107,6 +107,7 @@ AbstractButton {
107107 CardHeader {
108108 id: header
109109 objectName: "cardHeader"
110+ inOverlay: root.template && root.template["overlay"] === true
110111 anchors {
111112 top: {
112113 if (template) {
qml/Dash/CardHeader.qml+4−3
@@ -30,6 +30,7 @@ Item {
3030 property real fontScale: 1.0
3131
3232 property alias headerAlignment: titleLabel.horizontalAlignment
33+ property bool inOverlay: false
3334
3435 visible: mascotImage.status === Image.Ready || title || price
3536 height: row.height > 0 ? row.height + row.margins * 2 : 0
@@ -46,7 +47,7 @@ Item {
4647 leftMargin: spacing
4748 rightMargin: spacing
4849 }
49− spacing: mascotShape.visible || (template && template["overlay"]) ? margins : 0
50+ spacing: mascotShape.visible || inOverlay ? margins : 0
5051
5152 UbuntuShape {
5253 id: mascotShape
@@ -83,7 +84,7 @@ Item {
8384 maximumLineCount: 2
8485 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale)
8586 // TODO karni (for each Label): Update Ubuntu.Components.Themes.Palette and use theme color instead
86− color: template["overlay"] === true ? "white" : "grey" // Theme.palette.normal.backgroundText
87+ color: inOverlay ? "white" : "grey" // Theme.palette.normal.backgroundText
8788 }
8889
8990 Label {
@@ -94,7 +95,7 @@ Item {
9495 font.weight: Font.Light
9596 visible: titleLabel.text && text
9697 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale)
97− color: template["overlay"] === true ? "white" : "grey" // Theme.palette.normal.backgroundText
98+ color: inOverlay ? "white" : "grey" // Theme.palette.normal.backgroundText
9899 }
99100
100101 Row {