1
=== modified file 'plugins/Dash/CardCreator.js'
2
--- plugins/Dash/CardCreator.js	2016-08-08 09:13:47 +0000
3
+++ plugins/Dash/CardCreator.js	2016-08-08 09:13:47 +0000
4
@@ -925,7 +925,7 @@
5
925
        code += kSocialActionsRowCode.arg(socialAnchors).arg(socialColor);
925
        code += kSocialActionsRowCode.arg(socialAnchors).arg(socialColor);
6
926
    }
926
    }
7
927
927
9
928
    if (artShapeStyle != "shadow" && artShapeStyle != "icon") {
928
    if (artShapeStyle != "shadow" && artShapeStyle != "icon" && !isCardTool) {
10
929
        var touchdownAnchors;
929
        var touchdownAnchors;
11
930
        if (hasBackground) {
930
        if (hasBackground) {
12
931
            touchdownAnchors = 'fill: backgroundLoader';
931
            touchdownAnchors = 'fill: backgroundLoader';
13
932
932
14
=== modified file 'tests/plugins/Dash/cardcreator/1.res.cardcreator'
15
--- tests/plugins/Dash/cardcreator/1.res.cardcreator	2016-08-08 09:13:47 +0000
16
+++ tests/plugins/Dash/cardcreator/1.res.cardcreator	2016-08-08 09:13:47 +0000
17
@@ -65,15 +65,5 @@
18
65
                        font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal; 
65
                        font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal; 
19
66
                        horizontalAlignment: Text.AlignHCenter;
66
                        horizontalAlignment: Text.AlignHCenter;
20
67
                    }
67
                    }
21
68
Loader {
22
69
    active: root.pressed;
23
70
    anchors { fill: artShapeLoader }
24
71
    sourceComponent: UbuntuShape {
25
72
        objectName: "touchdown";
26
73
        anchors.fill: parent;
27
74
        radius: "medium";
28
75
        borderSource: "radius_pressed.sci"
29
76
    }
30
77
}
31
78
implicitHeight: titleLabel.y + titleLabel.height + units.gu(1);
68
implicitHeight: titleLabel.y + titleLabel.height + units.gu(1);
32
79
}
69
}
33
80
70
34
=== modified file 'tests/plugins/Dash/cardcreator/11.res.cardcreator'
35
--- tests/plugins/Dash/cardcreator/11.res.cardcreator	2016-08-08 09:13:47 +0000
36
+++ tests/plugins/Dash/cardcreator/11.res.cardcreator	2016-08-08 09:13:47 +0000
37
@@ -156,15 +156,5 @@
38
156
 
156
 
39
157
                                ] 
157
                                ] 
40
158
                    }
158
                    }
41
159
Loader {
42
160
    active: root.pressed;
43
161
    anchors { fill: backgroundLoader }
44
162
    sourceComponent: UbuntuShape {
45
163
        objectName: "touchdown";
46
164
        anchors.fill: parent;
47
165
        radius: "medium";
48
166
        borderSource: "radius_pressed.sci"
49
167
    }
50
168
}
51
169
implicitHeight: row.y + row.height + units.gu(1);
159
implicitHeight: row.y + row.height + units.gu(1);
52
170
}
160
}
53
171
161
54
=== modified file 'tests/plugins/Dash/cardcreator/12.res.cardcreator'
55
--- tests/plugins/Dash/cardcreator/12.res.cardcreator	2016-08-08 09:13:47 +0000
56
+++ tests/plugins/Dash/cardcreator/12.res.cardcreator	2016-08-08 09:13:47 +0000
57
@@ -91,15 +91,5 @@
58
91
    model: cardData && cardData["socialActions"];
91
    model: cardData && cardData["socialActions"];
59
92
    onClicked: root.action(actionId);
92
    onClicked: root.action(actionId);
60
93
}
93
}
61
94
Loader {
62
95
    active: root.pressed;
63
96
    anchors { fill: artShapeLoader }
64
97
    sourceComponent: UbuntuShape {
65
98
        objectName: "touchdown";
66
99
        anchors.fill: parent;
67
100
        radius: "medium";
68
101
        borderSource: "radius_pressed.sci"
69
102
    }
70
103
}
71
104
implicitHeight: socialActionsRow.y + socialActionsRow.height + units.gu(1);
94
implicitHeight: socialActionsRow.y + socialActionsRow.height + units.gu(1);
72
105
}
95
}
73
106
96
74
=== modified file 'tests/plugins/Dash/cardcreator/4.res.cardcreator'
75
--- tests/plugins/Dash/cardcreator/4.res.cardcreator	2016-08-08 09:13:47 +0000
76
+++ tests/plugins/Dash/cardcreator/4.res.cardcreator	2016-08-08 09:13:47 +0000
77
@@ -95,15 +95,5 @@
78
95
}
95
}
79
96
]
96
]
80
97
}
97
}
81
98
Loader {
82
99
    active: root.pressed;
83
100
    anchors { fill: root }
84
101
    sourceComponent: UbuntuShape {
85
102
        objectName: "touchdown";
86
103
        anchors.fill: parent;
87
104
        radius: "medium";
88
105
        borderSource: "radius_pressed.sci"
89
106
    }
90
107
}
91
108
implicitHeight: row.y + row.height + units.gu(1);
98
implicitHeight: row.y + row.height + units.gu(1);
92
109
}
99
}
93
110
100
94
=== modified file 'tests/plugins/Dash/cardcreator/6.res.cardcreator'
95
--- tests/plugins/Dash/cardcreator/6.res.cardcreator	2016-08-08 09:13:47 +0000
96
+++ tests/plugins/Dash/cardcreator/6.res.cardcreator	2016-08-08 09:13:47 +0000
97
@@ -112,15 +112,5 @@
98
112
 
112
 
99
113
                            ]
113
                            ]
100
114
                        }
114
                        }
101
115
Loader {
102
116
    active: root.pressed;
103
117
    anchors { fill: backgroundLoader }
104
118
    sourceComponent: UbuntuShape {
105
119
        objectName: "touchdown";
106
120
        anchors.fill: parent;
107
121
        radius: "medium";
108
122
        borderSource: "radius_pressed.sci"
109
123
    }
110
124
}
111
125
implicitHeight: headerTitleContainer.y + headerTitleContainer.height + units.gu(1);
115
implicitHeight: headerTitleContainer.y + headerTitleContainer.height + units.gu(1);
112
126
}
116
}
113
127
117
114
=== modified file 'tests/plugins/Dash/cardcreator/8.res.cardcreator'
115
--- tests/plugins/Dash/cardcreator/8.res.cardcreator	2016-08-08 09:13:47 +0000
116
+++ tests/plugins/Dash/cardcreator/8.res.cardcreator	2016-08-08 09:13:47 +0000
117
@@ -93,15 +93,5 @@
118
93
 
93
 
119
94
                                ] 
94
                                ] 
120
95
                    }
95
                    }
121
96
Loader {
122
97
    active: root.pressed;
123
98
    anchors { fill: backgroundLoader }
124
99
    sourceComponent: UbuntuShape {
125
100
        objectName: "touchdown";
126
101
        anchors.fill: parent;
127
102
        radius: "medium";
128
103
        borderSource: "radius_pressed.sci"
129
104
    }
130
105
}
131
106
implicitHeight: row.y + row.height + units.gu(1);
96
implicitHeight: row.y + row.height + units.gu(1);
132
107
}
97
}
133
108
98
134
=== modified file 'tests/plugins/Dash/cardcreator/9.res.cardcreator'
135
--- tests/plugins/Dash/cardcreator/9.res.cardcreator	2016-08-08 09:13:47 +0000
136
+++ tests/plugins/Dash/cardcreator/9.res.cardcreator	2016-08-08 09:13:47 +0000
137
@@ -105,15 +105,5 @@
138
105
                            onPressAndHold: { 
105
                            onPressAndHold: { 
139
106
                                root.pressAndHold(); 
106
                                root.pressAndHold(); 
140
107
                            } 
107
                            } 
152
108
                        }Loader {
108
                        }implicitHeight: audioButton.height;
142
109
    active: root.pressed;
143
110
    anchors { fill: root }
144
111
    sourceComponent: UbuntuShape {
145
112
        objectName: "touchdown";
146
113
        anchors.fill: parent;
147
114
        radius: "medium";
148
115
        borderSource: "radius_pressed.sci"
149
116
    }
150
117
}
151
118
implicitHeight: audioButton.height;
153
119
}
109
}
Status:	Merged
Approved by:	Andrea Cimitan on 2016-08-16
Approved revision:	2547
Merged at revision:	2618
Proposed branch:	lp:~aacid/unity8/noTouchdownForCardToolCard
Merge into:	lp:unity8
Prerequisite:	lp:~aacid/unity8/touchdownLoader
Diff against target:	153 lines (+2/-72) 8 files modified plugins/Dash/CardCreator.js (+1/-1) tests/plugins/Dash/cardcreator/1.res.cardcreator (+0/-10) tests/plugins/Dash/cardcreator/11.res.cardcreator (+0/-10) tests/plugins/Dash/cardcreator/12.res.cardcreator (+0/-10) tests/plugins/Dash/cardcreator/4.res.cardcreator (+0/-10) tests/plugins/Dash/cardcreator/6.res.cardcreator (+0/-10) tests/plugins/Dash/cardcreator/8.res.cardcreator (+0/-10) tests/plugins/Dash/cardcreator/9.res.cardcreator (+1/-11)
To merge this branch:	bzr merge lp:~aacid/unity8/noTouchdownForCardToolCard
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration		Needs Fixing on 2016-08-18
Andrea Cimitan (community)		2016-07-21	Approve on 2016-08-16
Review via email: mp+300739@code.launchpad.net
1	=== modified file 'plugins/Dash/CardCreator.js'
2	--- plugins/Dash/CardCreator.js 2016-08-08 09:13:47 +0000
3	+++ plugins/Dash/CardCreator.js 2016-08-08 09:13:47 +0000
4	@@ -925,7 +925,7 @@
5	925	code += kSocialActionsRowCode.arg(socialAnchors).arg(socialColor);	925	code += kSocialActionsRowCode.arg(socialAnchors).arg(socialColor);
6	926	}	926	}
7	927		927
9	928	if (artShapeStyle != "shadow" && artShapeStyle != "icon") {	928	if (artShapeStyle != "shadow" && artShapeStyle != "icon" && !isCardTool) {
10	929	var touchdownAnchors;	929	var touchdownAnchors;
11	930	if (hasBackground) {	930	if (hasBackground) {
12	931	touchdownAnchors = 'fill: backgroundLoader';	931	touchdownAnchors = 'fill: backgroundLoader';
13	932		932
14	=== modified file 'tests/plugins/Dash/cardcreator/1.res.cardcreator'
15	--- tests/plugins/Dash/cardcreator/1.res.cardcreator 2016-08-08 09:13:47 +0000
16	+++ tests/plugins/Dash/cardcreator/1.res.cardcreator 2016-08-08 09:13:47 +0000
17	@@ -65,15 +65,5 @@
18	65	font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;	65	font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
19	66	horizontalAlignment: Text.AlignHCenter;	66	horizontalAlignment: Text.AlignHCenter;
20	67	}	67	}
21	68	Loader {
22	69	active: root.pressed;
23	70	anchors { fill: artShapeLoader }
24	71	sourceComponent: UbuntuShape {
25	72	objectName: "touchdown";
26	73	anchors.fill: parent;
27	74	radius: "medium";
28	75	borderSource: "radius_pressed.sci"
29	76	}
30	77	}
31	78	implicitHeight: titleLabel.y + titleLabel.height + units.gu(1);	68	implicitHeight: titleLabel.y + titleLabel.height + units.gu(1);
32	79	}	69	}
33	80		70
34	=== modified file 'tests/plugins/Dash/cardcreator/11.res.cardcreator'
35	--- tests/plugins/Dash/cardcreator/11.res.cardcreator 2016-08-08 09:13:47 +0000
36	+++ tests/plugins/Dash/cardcreator/11.res.cardcreator 2016-08-08 09:13:47 +0000
37	@@ -156,15 +156,5 @@
38	156		156
39	157	]	157	]
40	158	}	158	}
41	159	Loader {
42	160	active: root.pressed;
43	161	anchors { fill: backgroundLoader }
44	162	sourceComponent: UbuntuShape {
45	163	objectName: "touchdown";
46	164	anchors.fill: parent;
47	165	radius: "medium";
48	166	borderSource: "radius_pressed.sci"
49	167	}
50	168	}
51	169	implicitHeight: row.y + row.height + units.gu(1);	159	implicitHeight: row.y + row.height + units.gu(1);
52	170	}	160	}
53	171		161
54	=== modified file 'tests/plugins/Dash/cardcreator/12.res.cardcreator'
55	--- tests/plugins/Dash/cardcreator/12.res.cardcreator 2016-08-08 09:13:47 +0000
56	+++ tests/plugins/Dash/cardcreator/12.res.cardcreator 2016-08-08 09:13:47 +0000
57	@@ -91,15 +91,5 @@
58	91	model: cardData && cardData["socialActions"];	91	model: cardData && cardData["socialActions"];
59	92	onClicked: root.action(actionId);	92	onClicked: root.action(actionId);
60	93	}	93	}
61	94	Loader {
62	95	active: root.pressed;
63	96	anchors { fill: artShapeLoader }
64	97	sourceComponent: UbuntuShape {
65	98	objectName: "touchdown";
66	99	anchors.fill: parent;
67	100	radius: "medium";
68	101	borderSource: "radius_pressed.sci"
69	102	}
70	103	}
71	104	implicitHeight: socialActionsRow.y + socialActionsRow.height + units.gu(1);	94	implicitHeight: socialActionsRow.y + socialActionsRow.height + units.gu(1);
72	105	}	95	}
73	106		96
74	=== modified file 'tests/plugins/Dash/cardcreator/4.res.cardcreator'
75	--- tests/plugins/Dash/cardcreator/4.res.cardcreator 2016-08-08 09:13:47 +0000
76	+++ tests/plugins/Dash/cardcreator/4.res.cardcreator 2016-08-08 09:13:47 +0000
77	@@ -95,15 +95,5 @@
78	95	}	95	}
79	96	]	96	]
80	97	}	97	}
81	98	Loader {
82	99	active: root.pressed;
83	100	anchors { fill: root }
84	101	sourceComponent: UbuntuShape {
85	102	objectName: "touchdown";
86	103	anchors.fill: parent;
87	104	radius: "medium";
88	105	borderSource: "radius_pressed.sci"
89	106	}
90	107	}
91	108	implicitHeight: row.y + row.height + units.gu(1);	98	implicitHeight: row.y + row.height + units.gu(1);
92	109	}	99	}
93	110		100
94	=== modified file 'tests/plugins/Dash/cardcreator/6.res.cardcreator'
95	--- tests/plugins/Dash/cardcreator/6.res.cardcreator 2016-08-08 09:13:47 +0000
96	+++ tests/plugins/Dash/cardcreator/6.res.cardcreator 2016-08-08 09:13:47 +0000
97	@@ -112,15 +112,5 @@
98	112		112
99	113	]	113	]
100	114	}	114	}
101	115	Loader {
102	116	active: root.pressed;
103	117	anchors { fill: backgroundLoader }
104	118	sourceComponent: UbuntuShape {
105	119	objectName: "touchdown";
106	120	anchors.fill: parent;
107	121	radius: "medium";
108	122	borderSource: "radius_pressed.sci"
109	123	}
110	124	}
111	125	implicitHeight: headerTitleContainer.y + headerTitleContainer.height + units.gu(1);	115	implicitHeight: headerTitleContainer.y + headerTitleContainer.height + units.gu(1);
112	126	}	116	}
113	127		117
114	=== modified file 'tests/plugins/Dash/cardcreator/8.res.cardcreator'
115	--- tests/plugins/Dash/cardcreator/8.res.cardcreator 2016-08-08 09:13:47 +0000
116	+++ tests/plugins/Dash/cardcreator/8.res.cardcreator 2016-08-08 09:13:47 +0000
117	@@ -93,15 +93,5 @@
118	93		93
119	94	]	94	]
120	95	}	95	}
121	96	Loader {
122	97	active: root.pressed;
123	98	anchors { fill: backgroundLoader }
124	99	sourceComponent: UbuntuShape {
125	100	objectName: "touchdown";
126	101	anchors.fill: parent;
127	102	radius: "medium";
128	103	borderSource: "radius_pressed.sci"
129	104	}
130	105	}
131	106	implicitHeight: row.y + row.height + units.gu(1);	96	implicitHeight: row.y + row.height + units.gu(1);
132	107	}	97	}
133	108		98
134	=== modified file 'tests/plugins/Dash/cardcreator/9.res.cardcreator'
135	--- tests/plugins/Dash/cardcreator/9.res.cardcreator 2016-08-08 09:13:47 +0000
136	+++ tests/plugins/Dash/cardcreator/9.res.cardcreator 2016-08-08 09:13:47 +0000
137	@@ -105,15 +105,5 @@
138	105	onPressAndHold: {	105	onPressAndHold: {
139	106	root.pressAndHold();	106	root.pressAndHold();
140	107	}	107	}
152	108	}Loader {	108	}implicitHeight: audioButton.height;
142	109	active: root.pressed;
143	110	anchors { fill: root }
144	111	sourceComponent: UbuntuShape {
145	112	objectName: "touchdown";
146	113	anchors.fill: parent;
147	114	radius: "medium";
148	115	borderSource: "radius_pressed.sci"
149	116	}
150	117	}
151	118	implicitHeight: audioButton.height;
153	119	}	109	}