git.iko.soy/unity8
on xenial help sign in
Background needs to be specified to be visible in horizontal cards Fixes: #1411748
ddb61a3Andrea Cimitan
plugins/Dash/CardCreator.js+2−1
compare with xenial
unifiedsplit
@@ -320,7 +320,8 @@ function cardString(template, components) {
320 var hasSummary = components["summary"] || false;
320 var hasSummary = components["summary"] || false;
321 var artAndSummary = hasArt && hasSummary;
321 var artAndSummary = hasArt && hasSummary;
322 var isHorizontal = template["card-layout"] === "horizontal";
322 var isHorizontal = template["card-layout"] === "horizontal";
323− var hasBackground = (hasSummary || !isHorizontal) && (template["card-background"] || components["background"] || artAndSummary);
323+ var hasBackground = (!isHorizontal && (template["card-background"] || components["background"] || artAndSummary)) ||
324+ (hasSummary && (template["card-background"] || components["background"]));
324 var hasTitle = components["title"] || false;
325 var hasTitle = components["title"] || false;
325 var hasMascot = components["mascot"] || false;
326 var hasMascot = components["mascot"] || false;
326 var hasEmblem = components["emblem"] && !(hasMascot && template["card-size"] === "small") || false;
327 var hasEmblem = components["emblem"] && !(hasMascot && template["card-size"] === "small") || false;
tests/qmltests/Dash/tst_Card.qml+7−1
@@ -60,7 +60,7 @@ Rectangle {
60 "layout": { "components": Helpers.update(JSON.parse(Helpers.fullMapping), { "art": { "aspect-ratio": 0.7 } }) }
60 "layout": { "components": Helpers.update(JSON.parse(Helpers.fullMapping), { "art": { "aspect-ratio": 0.7 } }) }
61 },
61 },
62 {
62 {
63− "name": "Art, header, summary - horizontal",
63+ "name": "Art, header, summary, background - horizontal",
64 "layout": { "template": { "card-layout": "horizontal", "card-background": { "type": "gradient", "elements": ["grey", "white"] } },
64 "layout": { "template": { "card-layout": "horizontal", "card-background": { "type": "gradient", "elements": ["grey", "white"] } },
65 "components": JSON.parse(Helpers.fullMapping) }
65 "components": JSON.parse(Helpers.fullMapping) }
66 },
66 },
@@ -101,6 +101,11 @@ Rectangle {
101 "layout": { "template": { "overlay": true },
101 "layout": { "template": { "overlay": true },
102 "components": { "art": "art", "title": "title" } }
102 "components": { "art": "art", "title": "title" } }
103 },
103 },
104+ {
105+ "name": "Art, header, summary - horizontal",
106+ "layout": { "template": { "card-layout": "horizontal" },
107+ "components": JSON.parse(Helpers.fullMapping) }
108+ },
104 ]
109 ]
105
110
106 CardTool {
111 CardTool {
@@ -415,6 +420,7 @@ Rectangle {
415 background: Qt.resolvedUrl("artwork/checkers.png"), index: 10 },
420 background: Qt.resolvedUrl("artwork/checkers.png"), index: 10 },
416 { tag: "Gradient background", visible: true, color: "#808080", gradientColor: "#ffffff", index: 11 },
421 { tag: "Gradient background", visible: true, color: "#808080", gradientColor: "#ffffff", index: 11 },
417 { tag: "Image background", visible: true, image: Qt.resolvedUrl("artwork/checkers.png"), index: 12 },
422 { tag: "Image background", visible: true, image: Qt.resolvedUrl("artwork/checkers.png"), index: 12 },
423+ { tag: "Horizontal no background", visible: false, index: 14 },
418 ];
424 ];
419 }
425 }
420
426