git.iko.soy/unity8
on xenial help sign in
Don't show mascot shape in overlay.
7c3d9acMichał Karnicki
qml/Dash/Card.qml+2−4
compare with xenial
unifiedsplit
@@ -28,7 +28,6 @@ Item {
28 readonly property alias headerHeight: header.height
28 readonly property alias headerHeight: header.height
29
29
30 property bool showHeader: true
30 property bool showHeader: true
31− readonly property bool inOverlay: template["overlay"] === true
32
31
33 implicitWidth: childrenRect.width
32 implicitWidth: childrenRect.width
34 implicitHeight: summary.y + summary.height + (summary.text && background.visible ? units.gu(1) : 0)
33 implicitHeight: summary.y + summary.height + (summary.text && background.visible ? units.gu(1) : 0)
@@ -140,7 +139,6 @@ Item {
140 CardHeader {
139 CardHeader {
141 id: header
140 id: header
142 objectName: "cardHeader"
141 objectName: "cardHeader"
143−
144 anchors {
142 anchors {
145 top: {
143 top: {
146 if (template) {
144 if (template) {
@@ -163,9 +161,9 @@ Item {
163 subtitle: cardData && cardData["subtitle"] || ""
161 subtitle: cardData && cardData["subtitle"] || ""
164
162
165 opacity: showHeader ? 1 : 0
163 opacity: showHeader ? 1 : 0
166− inOverlay: root.inOverlay
164+ inOverlay: template["overlay"] === true
167 fontColor: inOverlay ? "white" : summary.getFontColor(background.color)
165 fontColor: inOverlay ? "white" : summary.getFontColor(background.color)
168− useMascotShape: !background.visible
166+ useMascotShape: !background.visible && !inOverlay
169
167
170 Behavior on opacity { NumberAnimation { duration: UbuntuAnimation.SnapDuration } }
168 Behavior on opacity { NumberAnimation { duration: UbuntuAnimation.SnapDuration } }
171 }
169 }