git.iko.soy/unity8
on xenial help sign in
Fix title alignment test and binding, clean up old components from CardHelpers.js
05bbb14Michał Sawicz
qml/Dash/CardTool.qml+8−3
compare with xenial
unifiedsplit
@@ -136,13 +136,18 @@ Item {
136 readonly property int titleAlignment: {
136 readonly property int titleAlignment: {
137 if (template["card-layout"] === "horizontal"
137 if (template["card-layout"] === "horizontal"
138 || typeof components["title"] !== "object"
138 || typeof components["title"] !== "object"
139− || components["title"]["align"] !== "center") return Text.AlignHCenter;
139+ || components["title"]["align"] !== "center") return Text.AlignLeft;
140
140
141 var keys = ["mascot", "emblem", "subtitle", "attributes", "summary"];
141 var keys = ["mascot", "emblem", "subtitle", "attributes", "summary"];
142
142
143 for (var key in keys) {
143 for (var key in keys) {
144+ key = keys[key];
145+ try {
144− if (typeof components[key] === "string"
146+ if (typeof components[key] === "string"
145− || typeof components[key]["field"] === "string") return Text.AlignLeft;
147+ || typeof components[key]["field"] === "string") return Text.AlignLeft;
148+ } catch (e) {
149+ continue;
150+ }
146 }
151 }
147
152
148 return Text.AlignHCenter;
153 return Text.AlignHCenter;
tests/qmltests/Dash/CardHelpers.js+1−12
@@ -16,7 +16,7 @@
16
16
17.pragma library
17.pragma library
18
18
19−var components = ["title", "art", "subtitle", "mascot", "emblem", "old-price", "price", "alt-price", "rating", "alt-rating", "summary", "attributes", "overlayColor"]
19+var components = ["title", "art", "subtitle", "mascot", "emblem", "summary", "attributes", "overlayColor"]
20
20
21var defaultLayout = ' \
21var defaultLayout = ' \
22{ \
22{ \
@@ -37,17 +37,6 @@ var defaultLayout = ' \
37 "overlayColor": null, \
37 "overlayColor": null, \
38 "mascot": null, \
38 "mascot": null, \
39 "emblem": null, \
39 "emblem": null, \
40− "old-price": null, \
41− "price": null, \
42− "alt-price": null, \
43− "rating": { \
44− "type": "stars", \
45− "range": [0, 5], \
46− "full": "image://theme/rating-star-full", \
47− "half": "image://theme/rating-star-half", \
48− "empty": "image://theme/rating-star-empty" \
49− }, \
50− "alt-rating": null, \
51 "summary": null, \
40 "summary": null, \
52 "attributes": { "max-count": 2 } \
41 "attributes": { "max-count": 2 } \
53 }, \
42 }, \
tests/qmltests/Dash/tst_CardTool.qml+4−3
@@ -339,11 +339,12 @@ Rectangle {
339 function test_card_title_alignment(data) {
339 function test_card_title_alignment(data) {
340 selector.selectedIndex = data.index;
340 selector.selectedIndex = data.index;
341
341
342+ tryCompare(cardTool, "titleAlignment", Text.AlignLeft);
343+
342 cardTool.components['title'] = { "field": "title", "align": "center" };
344 cardTool.components['title'] = { "field": "title", "align": "center" };
345+ cardTool.componentsChanged();
343
346
344− if (data.hasOwnProperty("property")) {
345− tryCompare(cardTool, "titleAlignment", data.value);
347+ tryCompare(cardTool, "titleAlignment", data.value);
346− }
347 }
348 }
348
349
349 function test_categoryLayout_data() {
350 function test_categoryLayout_data() {