git.iko.soy/unity8
on xenial help sign in
Fix right padding and tests
commit2620862270fce4d55a894f37152f7a6ee1eab3f0 authorAndrea Cimitan <andrea.cimitan@gmail.com> dateThu 21 Aug 2014, 12:22 (12 years ago) parent9de73b2908134c
3 files changed+5−1
compare with xenial
unifiedsplit
plugins/Dash/CardCreator.js+2 tests/plugins/Dash/cardcreator/5.res+2 tests/qmltests/Dash/tst_Card.qml+1−1
plugins/Dash/CardCreator.js+2
@@ -467,6 +467,8 @@ function cardString(template, components) {
467467 if (!touchdownOnArtShape) {
468468 extraRightAnchor = 'rightMargin: units.gu(1); \n';
469469 extraLeftAnchor = 'leftMargin: units.gu(1); \n';
470+ } else if (headerAsOverlay && !hasEmblem) {
471+ extraRightAnchor = 'rightMargin: units.gu(1); \n';
470472 }
471473
472474 if (hasMascot) {
tests/plugins/Dash/cardcreator/5.res+2
@@ -103,6 +103,7 @@ Label {
103103 id: titleLabel;
104104 objectName: "titleLabel";
105105 anchors { right: parent.right;
106+ rightMargin: units.gu(1);
106107 left: parent.left;
107108 leftMargin: units.gu(1);
108109 top: overlayLoader.top;
@@ -124,6 +125,7 @@ Label {
124125 objectName: "subtitleLabel";
125126 anchors { left: titleLabel.left;
126127 leftMargin: titleLabel.leftMargin;
128+ rightMargin: units.gu(1);
127129 right: titleLabel.right;
128130 top: titleLabel.bottom;
129131 }
tests/qmltests/Dash/tst_Card.qml+1−1
@@ -99,7 +99,7 @@ Rectangle {
9999 {
100100 "name": "Art, title - overlaid",
101101 "layout": { "template": { "overlay": true },
102− "components": { "art": "art", "summary": "summary" } }
102+ "components": { "art": "art", "title": "title" } }
103103 },
104104 ]
105105