git.iko.soy/unity8
on xenial help sign in
Merge card overlay.
e9d4b51Michał Sawicz
qml/Dash/Card.qml+60−3
compare with xenial
unifiedsplit
@@ -23,8 +23,10 @@ AbstractButton {
23 property var components
23 property var components
24 property var cardData
24 property var cardData
25
25
26+ property alias fontScale: header.fontScale
27+
26 implicitWidth: childrenRect.width
28 implicitWidth: childrenRect.width
27− implicitHeight: childrenRect.height
29+ implicitHeight: summary.y + summary.height
28
30
29 UbuntuShape {
31 UbuntuShape {
30 id: artShape
32 id: artShape
@@ -58,13 +60,67 @@ AbstractButton {
58 }
60 }
59 }
61 }
60
62
63+ ShaderEffect {
64+ id: overlay
65+ anchors {
66+ left: artShape.left
67+ right: artShape.right
68+ bottom: artShape.bottom
69+ }
70+
71+ height: units.gu(8)
72+ opacity: 0.6
73+ visible: template && template["overlay"] && artShape.visible && artShape.image.status === Image.Ready || false
74+
75+ property var source: ShaderEffectSource {
76+ id: shaderSource
77+ sourceItem: artShape
78+ onVisibleChanged: if (visible) scheduleUpdate()
79+ live: false
80+ sourceRect: Qt.rect(0, artShape.height - overlay.height, artShape.width, overlay.height)
81+ }
82+
83+ vertexShader: "
84+ uniform highp mat4 qt_Matrix;
85+ attribute highp vec4 qt_Vertex;
86+ attribute highp vec2 qt_MultiTexCoord0;
87+ varying highp vec2 coord;
88+ void main() {
89+ coord = qt_MultiTexCoord0;
90+ gl_Position = qt_Matrix * qt_Vertex;
91+ }"
92+
93+ fragmentShader: "
94+ varying highp vec2 coord;
95+ uniform sampler2D source;
96+ uniform lowp float qt_Opacity;
97+ void main() {
98+ lowp vec4 tex = texture2D(source, coord);
99+ gl_FragColor = vec4(0, 0, 0, tex.a) * qt_Opacity;
100+ }"
101+
102+ }
103+
61 CardHeader {
104 CardHeader {
62 id: header
105 id: header
63 objectName: "cardHeader"
106 objectName: "cardHeader"
64 anchors {
107 anchors {
108+ top: {
109+ if (template) {
110+ if (template["overlay"]) return overlay.top;
65− top: template && template["card-layout"] === "horizontal" ? artShape.top : artShape.bottom
111+ if (template["card-layout"] === "horizontal") return artShape.top;
112+ }
113+ return artShape.bottom;
114+ }
115+ left: {
116+ if (template) {
66− left: template && template["card-layout"] === "horizontal" ? artShape.right : parent.left
117+ if (!template["overlay"] && template["card-layout"] === "horizontal") return artShape.right;
118+ }
119+ return parent.left;
120+ }
67 right: parent.right
121 right: parent.right
122+ margins: template && template["overlay"] ? units.gu(1) : 0
123+ topMargin: 0
68 }
124 }
69
125
70 mascot: cardData && cardData["mascot"] || ""
126 mascot: cardData && cardData["mascot"] || ""
@@ -73,6 +129,7 @@ AbstractButton {
73 }
129 }
74
130
75 Label {
131 Label {
132+ id: summary
76 objectName: "summaryLabel"
133 objectName: "summaryLabel"
77 anchors { top: header.visible ? header.bottom : artShape.bottom; left: parent.left; right: parent.right }
134 anchors { top: header.visible ? header.bottom : artShape.bottom; left: parent.left; right: parent.right }
78 wrapMode: Text.Wrap
135 wrapMode: Text.Wrap
qml/Dash/CardHeader.qml+5
@@ -26,6 +26,9 @@ Item {
26 property alias oldPrice: oldPriceLabel.text
26 property alias oldPrice: oldPriceLabel.text
27 property alias altPrice: altPriceLabel.text
27 property alias altPrice: altPriceLabel.text
28
28
29+ // FIXME: Saviq, used to scale fonts down in Carousel
30+ property real fontScale: 1.0
31+
29 visible: mascotImage.status === Image.Ready || title || price
32 visible: mascotImage.status === Image.Ready || title || price
30 height: row.height > 0 ? row.height + row.margins * 2 : 0
33 height: row.height > 0 ? row.height + row.margins * 2 : 0
31
34
@@ -77,6 +80,7 @@ Item {
77 wrapMode: Text.Wrap
80 wrapMode: Text.Wrap
78 maximumLineCount: 2
81 maximumLineCount: 2
79 fontSize: "small"
82 fontSize: "small"
83+ font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale)
80 }
84 }
81
85
82 Label {
86 Label {
@@ -87,6 +91,7 @@ Item {
87 font.weight: Font.Light
91 font.weight: Font.Light
88 visible: titleLabel.text && text
92 visible: titleLabel.text && text
89 fontSize: "x-small"
93 fontSize: "x-small"
94+ font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale)
90 }
95 }
91
96
92 Row {
97 Row {
tests/qmltests/Dash/tst_Card.qml+1
@@ -224,6 +224,7 @@ Rectangle {
224 }
224 }
225
225
226 function test_card_size(data) {
226 function test_card_size(data) {
227+ waitForRendering(card);
227 selector.selectedIndex = data.index;
228 selector.selectedIndex = data.index;
228
229
229 if (data.hasOwnProperty("size")) {
230 if (data.hasOwnProperty("size")) {