Merge lp:~paulliu/unity8/lp1330957 into lp:unity8

Proposed by Ying-Chun Liu
Status: Merged
Approved by: Andrea Cimitan
Approved revision: 978
Merged at revision: 991
Proposed branch: lp:~paulliu/unity8/lp1330957
Merge into: lp:unity8
Diff against target: 60 lines (+8/-3)
3 files modified
plugins/Dash/CardCreator.js (+6/-3)
tests/plugins/Dash/cardcreator/1.res (+1/-0)
tests/plugins/Dash/cardcreator/3.res (+1/-0)
To merge this branch: bzr merge lp:~paulliu/unity8/lp1330957
Reviewer Review Type Date Requested Status
Andrea Cimitan (community) Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Michał Sawicz Abstain
Review via email: mp+223779@code.launchpad.net

Commit message

Fix LP:1330957
Fix some failed test cases.

Description of the change

* Are there any related MPs required for this MP to build/function as expected?
No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
N/A

To post a comment you must log in.
lp:~paulliu/unity8/lp1330957 updated
977. By Ying-Chun Liu on 2014-06-20

Rename variables.

Andrea Cimitan (cimi) wrote :

Tags!

review: Needs Fixing
Michał Sawicz (saviq) wrote :

This doesn't fix the actual bug, go into tryCard, remove the mascot from the top edit field, see that title and subtitle are not padded away from the left edge.

review: Needs Fixing
Ying-Chun Liu (paulliu) wrote :

> This doesn't fix the actual bug, go into tryCard, remove the mascot from the
> top edit field, see that title and subtitle are not padded away from the left
> edge.

Hi.

http://goo.gl/ZMUrfv

In my computer it does. Can you double check it? I've tried to console.log the TitleAnchor and it does have the leftMargin:unit(1).

Or there's other cases that I missed?

Michał Sawicz (saviq) wrote :

Sorry, I must not have built after merging your branch.

review: Abstain
lp:~paulliu/unity8/lp1330957 updated
978. By Ying-Chun Liu on 2014-06-25

Revert tst_Card.qml changes.

Andrea Cimitan (cimi) wrote :

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes
 * Did CI run pass? If not, please explain why.
Unrelated

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/Dash/CardCreator.js'
2--- plugins/Dash/CardCreator.js 2014-06-23 09:16:05 +0000
3+++ plugins/Dash/CardCreator.js 2014-06-25 08:30:29 +0000
4@@ -363,11 +363,11 @@
5 }
6 }
7 var headerLeftAnchor;
8- var headerLeftAnchorHasMagin = false;
9+ var headerLeftAnchorHasMargin = false;
10 if (isHorizontal && hasArt) {
11 headerLeftAnchor = 'left: artShapeHolder.right; \n\
12 leftMargin: units.gu(1);\n';
13- headerLeftAnchorHasMagin = true;
14+ headerLeftAnchorHasMargin = true;
15 } else {
16 headerLeftAnchor = 'left: parent.left;\n';
17 }
18@@ -392,7 +392,7 @@
19 if (!hasHeaderRow) {
20 anchors += headerLeftAnchor;
21 anchors += headerVerticalAnchors;
22- if (!headerLeftAnchorHasMagin) {
23+ if (!headerLeftAnchorHasMargin) {
24 anchors += 'leftMargin: units.gu(1);\n'
25 }
26 } else {
27@@ -444,6 +444,9 @@
28 titleAnchors = "right: parent.right;";
29 titleAnchors += headerLeftAnchor;
30 titleAnchors += headerVerticalAnchors;
31+ if (!headerLeftAnchorHasMargin) {
32+ titleAnchors += 'leftMargin: units.gu(1);\n'
33+ }
34 }
35 subtitleAnchors = 'left: titleLabel.left; \n\
36 leftMargin: titleLabel.leftMargin; \n\
37
38=== modified file 'tests/plugins/Dash/cardcreator/1.res'
39--- tests/plugins/Dash/cardcreator/1.res 2014-06-23 09:16:05 +0000
40+++ tests/plugins/Dash/cardcreator/1.res 2014-06-25 08:30:29 +0000
41@@ -68,6 +68,7 @@
42 anchors { right: parent.right;left: parent.left;
43 top: artShapeHolder.bottom;
44 topMargin: units.gu(1);
45+leftMargin: units.gu(1);
46 }
47 elide: Text.ElideRight;
48 fontSize: "small";
49
50=== modified file 'tests/plugins/Dash/cardcreator/3.res'
51--- tests/plugins/Dash/cardcreator/3.res 2014-06-23 09:16:05 +0000
52+++ tests/plugins/Dash/cardcreator/3.res 2014-06-25 08:30:29 +0000
53@@ -68,6 +68,7 @@
54 anchors { right: parent.right;left: parent.left;
55 top: artShapeHolder.bottom;
56 topMargin: units.gu(1);
57+leftMargin: units.gu(1);
58 }
59 elide: Text.ElideRight;
60 fontSize: "small";

Subscribers

People subscribed via source and target branches