Unity 8

plugins/Dash/CardCreator.js (+4/-11)
tests/plugins/Dash/cardcreator/1.res (+4/-11)
tests/plugins/Dash/cardcreator/1.res.cardcreator (+3/-10)
tests/plugins/Dash/cardcreator/11.res (+3/-10)
tests/plugins/Dash/cardcreator/11.res.cardcreator (+3/-10)
tests/plugins/Dash/cardcreator/3.res (+3/-10)
tests/plugins/Dash/cardcreator/3.res.cardcreator (+3/-10)
tests/plugins/Dash/cardcreator/5.res (+3/-10)
tests/plugins/Dash/cardcreator/5.res.cardcreator (+3/-10)

To merge this branch:

bzr merge lp:~aacid/unity8/appStoreCardWeirdSizing

Medium

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration	2016-03-03	Needs Fixing on 2016-03-24
Josh Arenson		2016-03-03	Approve on 2016-03-15
Review via email: mp+287920@code.launchpad.net

This proposal supersedes a proposal from 2016-03-03.

Commit Message

CardCreator: Remove ShaderEffectSource

Seems we don't really need it (can't see any regression without it) and it fixes the weird flickering of the appstore card when changing departments

Description of the Change

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

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

* Did you make sure that your branch does not contain spurious tags?
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

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-03: Posted in a previous version of this proposal

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/572/rebuild

review: Approve (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-03:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/573/rebuild

review: Approve (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-04:

FAILED: Continuous integration, rev:2211
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/582/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/582/rebuild

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-04:

FAILED: Continuous integration, rev:2211
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/583/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/583/rebuild

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-04:

FAILED: Continuous integration, rev:2211
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/598/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/789
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/805
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/805
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/803/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/803/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/803/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/803/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/803/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/803/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/598/rebuild

review: Needs Fixing (continuous-integration)

lp:~aacid/unity8/appStoreCardWeirdSizing updated on 2016-03-14

2212. By Albert Astals Cid on 2016-03-14: Merge

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-14:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/707/rebuild

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-14:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/725/rebuild

review: Needs Fixing (continuous-integration)

Josh Arenson (josharenson) wrote on 2016-03-15:

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

* Did CI run pass?
No, but the added one passes and CI is good enough.

* Did you make sure that the branch does not contain spurious tags?
Yes

Josh Arenson (josharenson) wrote on 2016-03-15:

Forgot to approve.

review: Approve

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-23:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/808/rebuild

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-24:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/828/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Albert Astals Cid

Mohammad Rakibul Hasan

Unity Team

1	=== modified file 'plugins/Dash/CardCreator.js'
2	--- plugins/Dash/CardCreator.js 2016-03-10 16:53:04 +0000
3	+++ plugins/Dash/CardCreator.js 2016-03-14 08:47:54 +0000
4	@@ -62,7 +62,7 @@
5	// %1 is used as anchors of artShapeHolder
6	// %2 is used as image width
7	// %3 is used as image height
8	-// %4 is used for artShapeSource.hideSource and inner Loader visible
9	+// %4 is whether the image or the Loader with the UbuntuShape/ProportionalShape should be visible
10	// %5 is used as aspect ratio fallback
11	// %6 is whether the loader should be asynchronous or not
12	// %7 is injected as code to artImage
13	@@ -84,14 +84,6 @@
14	objectName: "artShape"; \n\
15	visible: image.status == Image.Ready; \n\
16	readonly property alias image: artImage; \n\
17	- ShaderEffectSource { \n\
18	- id: artShapeSource; \n\
19	- sourceItem: artImage; \n\
20	- anchors.centerIn: parent; \n\
21	- width: 1; \n\
22	- height: 1; \n\
23	- hideSource: %4; \n\
24	- } \n\
25	Loader { \n\
26	anchors.fill: parent; \n\
27	visible: %4; \n\
28	@@ -99,7 +91,7 @@
29	Component { \n\
30	id: artShapeShapeComponent; \n\
31	UbuntuShape { \n\
32	- source: artShapeSource; \n\
33	+ source: artImage; \n\
34	sourceFillMode: UbuntuShape.PreserveAspectCrop; \n\
35	radius: "medium"; \n\
36	aspect: { \n\
37	@@ -114,7 +106,7 @@
38	} \n\
39	Component { \n\
40	id: artShapeIconComponent; \n\
41	- ProportionalShape { source: artShapeSource; aspect: UbuntuShape.DropShadow; } \n\
42	+ ProportionalShape { source: artImage; aspect: UbuntuShape.DropShadow; } \n\
43	} \n\
44	} \n\
45	readonly property real fixedArtShapeSizeAspect: (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) ? root.fixedArtShapeSize.width / root.fixedArtShapeSize.height : -1; \n\
46	@@ -135,6 +127,7 @@
47	objectName: "artImage"; \n\
48	source: artShapeLoader.cardArt; \n\
49	asynchronous: %6; \n\
50	+ visible: !%4; \n\
51	width: %2; \n\
52	height: %3; \n\
53	%7 \n\
54
55	=== modified file 'tests/plugins/Dash/cardcreator/1.res'
56	--- tests/plugins/Dash/cardcreator/1.res 2016-02-17 10:51:17 +0000
57	+++ tests/plugins/Dash/cardcreator/1.res 2016-03-14 08:47:54 +0000
58	@@ -30,14 +30,6 @@
59	objectName: "artShape";
60	visible: image.status == Image.Ready;
61	readonly property alias image: artImage;
62	- ShaderEffectSource {
63	- id: artShapeSource;
64	- sourceItem: artImage;
65	- anchors.centerIn: parent;
66	- width: 1;
67	- height: 1;
68	- hideSource: true;
69	- }
70	Loader {
71	anchors.fill: parent;
72	visible: true;
73	@@ -45,7 +37,7 @@
74	Component {
75	id: artShapeShapeComponent;
76	UbuntuShape {
77	- source: artShapeSource;
78	+ source: artImage;
79	sourceFillMode: UbuntuShape.PreserveAspectCrop;
80	radius: "medium";
81	aspect: {
82	@@ -60,7 +52,7 @@
83	}
84	Component {
85	id: artShapeIconComponent;
86	- ProportionalShape { source: artShapeSource; aspect: UbuntuShape.DropShadow; }
87	+ ProportionalShape { source: artImage; aspect: UbuntuShape.DropShadow; }
88	}
89	}
90	readonly property real fixedArtShapeSizeAspect: (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) ? root.fixedArtShapeSize.width / root.fixedArtShapeSize.height : -1;
91	@@ -81,7 +73,8 @@
92	objectName: "artImage";
93	source: artShapeLoader.cardArt;
94	asynchronous: true;
95	- width: root.width;
96	+ visible: !true;
97	+ width: root.width;
98	height: width / artShape.aspect;
99	}
100	}
101
102	=== modified file 'tests/plugins/Dash/cardcreator/1.res.cardcreator'
103	--- tests/plugins/Dash/cardcreator/1.res.cardcreator 2016-02-17 10:51:17 +0000
104	+++ tests/plugins/Dash/cardcreator/1.res.cardcreator 2016-03-14 08:47:54 +0000
105	@@ -29,14 +29,6 @@
106	objectName: "artShape";
107	visible: image.status == Image.Ready;
108	readonly property alias image: artImage;
109	- ShaderEffectSource {
110	- id: artShapeSource;
111	- sourceItem: artImage;
112	- anchors.centerIn: parent;
113	- width: 1;
114	- height: 1;
115	- hideSource: true;
116	- }
117	Loader {
118	anchors.fill: parent;
119	visible: true;
120	@@ -44,7 +36,7 @@
121	Component {
122	id: artShapeShapeComponent;
123	UbuntuShape {
124	- source: artShapeSource;
125	+ source: artImage;
126	sourceFillMode: UbuntuShape.PreserveAspectCrop;
127	radius: "medium";
128	aspect: {
129	@@ -59,7 +51,7 @@
130	}
131	Component {
132	id: artShapeIconComponent;
133	- ProportionalShape { source: artShapeSource; aspect: UbuntuShape.DropShadow; }
134	+ ProportionalShape { source: artImage; aspect: UbuntuShape.DropShadow; }
135	}
136	}
137	readonly property real fixedArtShapeSizeAspect: (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) ? root.fixedArtShapeSize.width / root.fixedArtShapeSize.height : -1;
138	@@ -80,6 +72,7 @@
139	objectName: "artImage";
140	source: artShapeLoader.cardArt;
141	asynchronous: false;
142	+ visible: !true;
143	width: root.width;
144	height: width / artShape.aspect;
145	}
146
147	=== modified file 'tests/plugins/Dash/cardcreator/11.res'
148	--- tests/plugins/Dash/cardcreator/11.res 2016-02-17 10:51:17 +0000
149	+++ tests/plugins/Dash/cardcreator/11.res 2016-03-14 08:47:54 +0000
150	@@ -68,14 +68,6 @@
151	objectName: "artShape";
152	visible: image.status == Image.Ready;
153	readonly property alias image: artImage;
154	- ShaderEffectSource {
155	- id: artShapeSource;
156	- sourceItem: artImage;
157	- anchors.centerIn: parent;
158	- width: 1;
159	- height: 1;
160	- hideSource: true;
161	- }
162	Loader {
163	anchors.fill: parent;
164	visible: true;
165	@@ -83,7 +75,7 @@
166	Component {
167	id: artShapeShapeComponent;
168	UbuntuShape {
169	- source: artShapeSource;
170	+ source: artImage;
171	sourceFillMode: UbuntuShape.PreserveAspectCrop;
172	radius: "medium";
173	aspect: {
174	@@ -98,7 +90,7 @@
175	}
176	Component {
177	id: artShapeIconComponent;
178	- ProportionalShape { source: artShapeSource; aspect: UbuntuShape.DropShadow; }
179	+ ProportionalShape { source: artImage; aspect: UbuntuShape.DropShadow; }
180	}
181	}
182	readonly property real fixedArtShapeSizeAspect: (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) ? root.fixedArtShapeSize.width / root.fixedArtShapeSize.height : -1;
183	@@ -119,6 +111,7 @@
184	objectName: "artImage";
185	source: artShapeLoader.cardArt;
186	asynchronous: true;
187	+ visible: !true;
188	width: root.width;
189	height: width / artShape.aspect;
190	onStatusChanged: if (status === Image.Error) source = decodeURI("%5C");
191
192	=== modified file 'tests/plugins/Dash/cardcreator/11.res.cardcreator'
193	--- tests/plugins/Dash/cardcreator/11.res.cardcreator 2016-02-17 10:51:17 +0000
194	+++ tests/plugins/Dash/cardcreator/11.res.cardcreator 2016-03-14 08:47:54 +0000
195	@@ -67,14 +67,6 @@
196	objectName: "artShape";
197	visible: image.status == Image.Ready;
198	readonly property alias image: artImage;
199	- ShaderEffectSource {
200	- id: artShapeSource;
201	- sourceItem: artImage;
202	- anchors.centerIn: parent;
203	- width: 1;
204	- height: 1;
205	- hideSource: true;
206	- }
207	Loader {
208	anchors.fill: parent;
209	visible: true;
210	@@ -82,7 +74,7 @@
211	Component {
212	id: artShapeShapeComponent;
213	UbuntuShape {
214	- source: artShapeSource;
215	+ source: artImage;
216	sourceFillMode: UbuntuShape.PreserveAspectCrop;
217	radius: "medium";
218	aspect: {
219	@@ -97,7 +89,7 @@
220	}
221	Component {
222	id: artShapeIconComponent;
223	- ProportionalShape { source: artShapeSource; aspect: UbuntuShape.DropShadow; }
224	+ ProportionalShape { source: artImage; aspect: UbuntuShape.DropShadow; }
225	}
226	}
227	readonly property real fixedArtShapeSizeAspect: (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) ? root.fixedArtShapeSize.width / root.fixedArtShapeSize.height : -1;
228	@@ -118,6 +110,7 @@
229	objectName: "artImage";
230	source: artShapeLoader.cardArt;
231	asynchronous: false;
232	+ visible: !true;
233	width: root.width;
234	height: width / artShape.aspect;
235	}
236
237	=== modified file 'tests/plugins/Dash/cardcreator/3.res'
238	--- tests/plugins/Dash/cardcreator/3.res 2016-02-17 10:51:17 +0000
239	+++ tests/plugins/Dash/cardcreator/3.res 2016-03-14 08:47:54 +0000
240	@@ -30,14 +30,6 @@
241	objectName: "artShape";
242	visible: image.status == Image.Ready;
243	readonly property alias image: artImage;
244	- ShaderEffectSource {
245	- id: artShapeSource;
246	- sourceItem: artImage;
247	- anchors.centerIn: parent;
248	- width: 1;
249	- height: 1;
250	- hideSource: true;
251	- }
252	Loader {
253	anchors.fill: parent;
254	visible: true;
255	@@ -45,7 +37,7 @@
256	Component {
257	id: artShapeShapeComponent;
258	UbuntuShape {
259	- source: artShapeSource;
260	+ source: artImage;
261	sourceFillMode: UbuntuShape.PreserveAspectCrop;
262	radius: "medium";
263	aspect: {
264	@@ -60,7 +52,7 @@
265	}
266	Component {
267	id: artShapeIconComponent;
268	- ProportionalShape { source: artShapeSource; aspect: UbuntuShape.DropShadow; }
269	+ ProportionalShape { source: artImage; aspect: UbuntuShape.DropShadow; }
270	}
271	}
272	readonly property real fixedArtShapeSizeAspect: (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) ? root.fixedArtShapeSize.width / root.fixedArtShapeSize.height : -1;
273	@@ -81,6 +73,7 @@
274	objectName: "artImage";
275	source: artShapeLoader.cardArt;
276	asynchronous: true;
277	+ visible: !true;
278	width: root.width;
279	height: width / artShape.aspect;
280	onStatusChanged: if (status === Image.Error) source = decodeURI("IHAVE%5C%22ESCAPED%5C%22QUOTES%5C%22");
281
282	=== modified file 'tests/plugins/Dash/cardcreator/3.res.cardcreator'
283	--- tests/plugins/Dash/cardcreator/3.res.cardcreator 2016-02-17 10:51:17 +0000
284	+++ tests/plugins/Dash/cardcreator/3.res.cardcreator 2016-03-14 08:47:54 +0000
285	@@ -29,14 +29,6 @@
286	objectName: "artShape";
287	visible: image.status == Image.Ready;
288	readonly property alias image: artImage;
289	- ShaderEffectSource {
290	- id: artShapeSource;
291	- sourceItem: artImage;
292	- anchors.centerIn: parent;
293	- width: 1;
294	- height: 1;
295	- hideSource: true;
296	- }
297	Loader {
298	anchors.fill: parent;
299	visible: true;
300	@@ -44,7 +36,7 @@
301	Component {
302	id: artShapeShapeComponent;
303	UbuntuShape {
304	- source: artShapeSource;
305	+ source: artImage;
306	sourceFillMode: UbuntuShape.PreserveAspectCrop;
307	radius: "medium";
308	aspect: {
309	@@ -59,7 +51,7 @@
310	}
311	Component {
312	id: artShapeIconComponent;
313	- ProportionalShape { source: artShapeSource; aspect: UbuntuShape.DropShadow; }
314	+ ProportionalShape { source: artImage; aspect: UbuntuShape.DropShadow; }
315	}
316	}
317	readonly property real fixedArtShapeSizeAspect: (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) ? root.fixedArtShapeSize.width / root.fixedArtShapeSize.height : -1;
318	@@ -80,6 +72,7 @@
319	objectName: "artImage";
320	source: artShapeLoader.cardArt;
321	asynchronous: false;
322	+ visible: !true;
323	width: root.width;
324	height: width / artShape.aspect;
325	}
326
327	=== modified file 'tests/plugins/Dash/cardcreator/5.res'
328	--- tests/plugins/Dash/cardcreator/5.res 2016-02-17 10:51:17 +0000
329	+++ tests/plugins/Dash/cardcreator/5.res 2016-03-14 08:47:54 +0000
330	@@ -30,14 +30,6 @@
331	objectName: "artShape";
332	visible: image.status == Image.Ready;
333	readonly property alias image: artImage;
334	- ShaderEffectSource {
335	- id: artShapeSource;
336	- sourceItem: artImage;
337	- anchors.centerIn: parent;
338	- width: 1;
339	- height: 1;
340	- hideSource: false;
341	- }
342	Loader {
343	anchors.fill: parent;
344	visible: false;
345	@@ -45,7 +37,7 @@
346	Component {
347	id: artShapeShapeComponent;
348	UbuntuShape {
349	- source: artShapeSource;
350	+ source: artImage;
351	sourceFillMode: UbuntuShape.PreserveAspectCrop;
352	radius: "medium";
353	aspect: {
354	@@ -60,7 +52,7 @@
355	}
356	Component {
357	id: artShapeIconComponent;
358	- ProportionalShape { source: artShapeSource; aspect: UbuntuShape.DropShadow; }
359	+ ProportionalShape { source: artImage; aspect: UbuntuShape.DropShadow; }
360	}
361	}
362	readonly property real fixedArtShapeSizeAspect: (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) ? root.fixedArtShapeSize.width / root.fixedArtShapeSize.height : -1;
363	@@ -81,6 +73,7 @@
364	objectName: "artImage";
365	source: artShapeLoader.cardArt;
366	asynchronous: true;
367	+ visible: !false;
368	width: root.width;
369	height: width / artShape.aspect;
370	}
371
372	=== modified file 'tests/plugins/Dash/cardcreator/5.res.cardcreator'
373	--- tests/plugins/Dash/cardcreator/5.res.cardcreator 2016-02-17 10:51:17 +0000
374	+++ tests/plugins/Dash/cardcreator/5.res.cardcreator 2016-03-14 08:47:54 +0000
375	@@ -29,14 +29,6 @@
376	objectName: "artShape";
377	visible: image.status == Image.Ready;
378	readonly property alias image: artImage;
379	- ShaderEffectSource {
380	- id: artShapeSource;
381	- sourceItem: artImage;
382	- anchors.centerIn: parent;
383	- width: 1;
384	- height: 1;
385	- hideSource: false;
386	- }
387	Loader {
388	anchors.fill: parent;
389	visible: false;
390	@@ -44,7 +36,7 @@
391	Component {
392	id: artShapeShapeComponent;
393	UbuntuShape {
394	- source: artShapeSource;
395	+ source: artImage;
396	sourceFillMode: UbuntuShape.PreserveAspectCrop;
397	radius: "medium";
398	aspect: {
399	@@ -59,7 +51,7 @@
400	}
401	Component {
402	id: artShapeIconComponent;
403	- ProportionalShape { source: artShapeSource; aspect: UbuntuShape.DropShadow; }
404	+ ProportionalShape { source: artImage; aspect: UbuntuShape.DropShadow; }
405	}
406	}
407	readonly property real fixedArtShapeSizeAspect: (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) ? root.fixedArtShapeSize.width / root.fixedArtShapeSize.height : -1;
408	@@ -80,6 +72,7 @@
409	objectName: "artImage";
410	source: artShapeLoader.cardArt;
411	asynchronous: false;
412	+ visible: !false;
413	width: root.width;
414	height: width / artShape.aspect;
415	}