Unity 8

Merge lp:~aacid/unity8/cardCreatorFixedHeaderSizeOptimization into lp:unity8

  1. cardCreatorFixedHeaderSizeOptimization
  2. Merge into trunk
Proposed by Albert Astals Cid
Status: Merged
Approved by: Andrea Cimitan
Approved revision: 2209
Merged at revision: 2240
Proposed branch: lp:~aacid/unity8/cardCreatorFixedHeaderSizeOptimization
Merge into: lp:unity8
Prerequisite: lp:~aacid/unity8/cardAsyncOnCompileTime
Diff against target: 387 lines (+25/-35)
20 files modified
plugins/Dash/CardCreator.js (+15/-8)
tests/plugins/Dash/cardcreator/1.res.cardcreator (+0/-1)
tests/plugins/Dash/cardcreator/10.res (+1/-1)
tests/plugins/Dash/cardcreator/10.res.cardcreator (+0/-2)
tests/plugins/Dash/cardcreator/11.res (+1/-1)
tests/plugins/Dash/cardcreator/11.res.cardcreator (+0/-2)
tests/plugins/Dash/cardcreator/2.res (+1/-1)
tests/plugins/Dash/cardcreator/2.res.cardcreator (+0/-2)
tests/plugins/Dash/cardcreator/3.res.cardcreator (+0/-1)
tests/plugins/Dash/cardcreator/4.res (+1/-1)
tests/plugins/Dash/cardcreator/4.res.cardcreator (+0/-2)
tests/plugins/Dash/cardcreator/5.res (+1/-1)
tests/plugins/Dash/cardcreator/5.res.cardcreator (+1/-2)
tests/plugins/Dash/cardcreator/6.res.cardcreator (+0/-1)
tests/plugins/Dash/cardcreator/7.res (+1/-1)
tests/plugins/Dash/cardcreator/7.res.cardcreator (+0/-2)
tests/plugins/Dash/cardcreator/8.res (+1/-1)
tests/plugins/Dash/cardcreator/8.res.cardcreator (+0/-2)
tests/plugins/Dash/cardcreator/9.res (+1/-1)
tests/plugins/Dash/cardcreator/9.res.cardcreator (+1/-2)
To merge this branch: bzr merge lp:~aacid/unity8/cardCreatorFixedHeaderSizeOptimization
Reviewer Review Type Date Requested Status
Andrea Cimitan (community) Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Unity8 CI Bot continuous-integration Needs Fixing
Review via email: mp+286281@code.launchpad.net

Commit message

Use fixedHeaderHeight only in the non cardtool cards

Description of the change

 * Are there any related MPs required for this MP to build/function as expected? Please list.
 * Did you perform an exploratory manual test run of your code change and any related functionality?
 * Did you make sure that your branch does not contain spurious tags?
 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
 * If you changed the UI, has there been a design review?

To post a comment you must log in.
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:2208
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/395/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/533
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay/173
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial/173
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/556
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/574
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/574
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/570
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/570/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/570
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/570/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/570
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/570/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/570
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/570/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/570
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/570/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/570
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/570/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Revision history for this message
Andrea Cimitan (cimi) wrote :

I personally like ternary operator, added some comments :) It's a style choice cause we use it a lot

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:2208
http://jenkins.qa.ubuntu.com/job/unity8-ci/7333/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6526
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/748/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/2038
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/741
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1933
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1933
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/740
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/739
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4983
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6537
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6537/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27697
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-xenial-touch/391/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/746
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/746/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27698

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/7333/rebuild

review: Needs Fixing (continuous-integration)
lp:~aacid/unity8/cardCreatorFixedHeaderSizeOptimization updated
2209. By Albert Astals Cid

Use ternary operators as suggested by Andrea

Revision history for this message
Albert Astals Cid (aacid) wrote :

> I personally like ternary operator, added some comments :) It's a style choice
> cause we use it a lot

Done

Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2209
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/404/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/544
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay/178
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial/178
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/567
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/586
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/586
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/582
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/582/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/582
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/582/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/582
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/582/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/582
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/582/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/582
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/582/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/582
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/582/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:2209
http://jenkins.qa.ubuntu.com/job/unity8-ci/7341/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6534
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/756/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/2046
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/749
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1941
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1941
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/748
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/747
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4988
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6545
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6545/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27709
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-xenial-touch/396/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/754
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/754/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27710

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/7341/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Andrea Cimitan (cimi) wrote :

 * Did you perform an exploratory manual test run of the code change and any related functionality?
y
 * Did CI run pass? If not, please explain why.
ap
 * Did you make sure that the branch does not contain spurious tags?
y

review: Approve
lp:~aacid/unity8/cardCreatorFixedHeaderSizeOptimization updated
2210. By Albert Astals Cid

Merge

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 2016-03-04 14:32:38 +0000
3+++ plugins/Dash/CardCreator.js 2016-03-04 14:32:38 +0000
4@@ -190,9 +190,10 @@
5 }';
6
7 // %1 is whether the loader should be asynchronous or not
8+// %2 is the header height code
9 var kOverlayLoaderCode = 'Loader { \n\
10 id: overlayLoader; \n\
11- readonly property real overlayHeight: (fixedHeaderHeight > 0 ? fixedHeaderHeight : headerHeight) + units.gu(2); \n\
12+ readonly property real overlayHeight: %2 + units.gu(2); \n\
13 anchors.fill: artShapeHolder; \n\
14 active: artShapeLoader.active && artShapeLoader.item && artShapeLoader.item.image.status === Image.Ready || false; \n\
15 asynchronous: %1; \n\
16@@ -214,17 +215,19 @@
17 objectName: "outerRow"; \n\
18 property real margins: units.gu(1); \n\
19 spacing: margins; \n\
20- height: root.fixedHeaderHeight != -1 ? root.fixedHeaderHeight : implicitHeight; \n\
21+ %2\
22 anchors { %1 } \n\
23 anchors.right: parent.right; \n\
24 anchors.margins: margins; \n\
25 anchors.rightMargin: 0; \n\
26 data: [ \n\
27- %2 \n\
28+ %3 \n\
29 ] \n\
30 }\n';
31 var args = Array.prototype.slice.call(arguments);
32- var code = kHeaderRowCodeTemplate.arg(args.shift()).arg(args.join(',\n'));
33+ var isCardTool = args.shift();
34+ var heightCode = isCardTool ? "" : "height: root.fixedHeaderHeight; \n";
35+ var code = kHeaderRowCodeTemplate.arg(args.shift()).arg(heightCode).arg(args.join(',\n'));
36 return code;
37 }
38
39@@ -415,7 +418,7 @@
40 property string backgroundShapeStyle: "inset"; \n\
41 property real fontScale: 1.0; \n\
42 property var scopeStyle: null; \n\
43- property int fixedHeaderHeight: -1; \n\
44+ %2\
45 property size fixedArtShapeSize: Qt.size(-1, -1); \n\
46 readonly property string title: cardData && cardData["title"] || ""; \n\
47 property bool showHeader: true; \n\
48@@ -423,6 +426,8 @@
49 enabled: %1; \n\
50 \n'.arg(templateInteractive);
51
52+ code = code.arg(isCardTool ? "" : "property int fixedHeaderHeight: -1; \n");
53+
54 var hasArt = components["art"] && components["art"]["field"] || false;
55 var hasSummary = components["summary"] || false;
56 var isConciergeMode = components["art"] && components["art"]["conciergeMode"] || false;
57@@ -524,7 +529,8 @@
58 }
59
60 if (headerAsOverlay) {
61- code += kOverlayLoaderCode.arg(asynchronous);
62+ var headerHeightCode = isCardTool ? "headerHeight" : "root.fixedHeaderHeight";
63+ code += kOverlayLoaderCode.arg(asynchronous).arg(headerHeightCode);
64 }
65
66 var headerVerticalAnchors;
67@@ -785,7 +791,7 @@
68 if (mascotShapeCode != '') {
69 rowCode.unshift(mascotShapeCode);
70 }
71- code += kHeaderRowCodeGenerator(headerVerticalAnchors + headerLeftAnchor, rowCode)
72+ code += kHeaderRowCodeGenerator(isCardTool, headerVerticalAnchors + headerLeftAnchor, rowCode)
73 } else {
74 code += mascotShapeCode + mascotCode + titleSubtitleCode;
75 }
76@@ -809,7 +815,8 @@
77 } else {
78 audioButtonAnchorsFill = 'undefined';
79 audioButtonWidth = 'height';
80- audioButtonHeight = '(root.fixedHeaderHeight > 0 ? root.fixedHeaderHeight : headerHeight) + 2 * units.gu(1)';
81+ audioButtonHeight = isCardTool ? 'headerHeight + 2 * units.gu(1)'
82+ : 'root.fixedHeaderHeight + 2 * units.gu(1)';
83 }
84 code += kAudioButtonCode.arg(audioButtonAnchorsFill).arg(audioButtonWidth).arg(audioButtonHeight);
85 }
86
87=== modified file 'tests/plugins/Dash/cardcreator/1.res.cardcreator'
88--- tests/plugins/Dash/cardcreator/1.res.cardcreator 2016-03-04 14:32:38 +0000
89+++ tests/plugins/Dash/cardcreator/1.res.cardcreator 2016-03-04 14:32:38 +0000
90@@ -5,7 +5,6 @@
91 property string backgroundShapeStyle: "inset";
92 property real fontScale: 1.0;
93 property var scopeStyle: null;
94- property int fixedHeaderHeight: -1;
95 property size fixedArtShapeSize: Qt.size(-1, -1);
96 readonly property string title: cardData && cardData["title"] || "";
97 property bool showHeader: true;
98
99=== modified file 'tests/plugins/Dash/cardcreator/10.res'
100--- tests/plugins/Dash/cardcreator/10.res 2016-03-04 14:32:38 +0000
101+++ tests/plugins/Dash/cardcreator/10.res 2016-03-04 14:32:38 +0000
102@@ -57,7 +57,7 @@
103 objectName: "outerRow";
104 property real margins: units.gu(1);
105 spacing: margins;
106- height: root.fixedHeaderHeight != -1 ? root.fixedHeaderHeight : implicitHeight;
107+ height: root.fixedHeaderHeight;
108 anchors { top: parent.top;
109 topMargin: units.gu(1);
110 left: parent.left;
111
112=== modified file 'tests/plugins/Dash/cardcreator/10.res.cardcreator'
113--- tests/plugins/Dash/cardcreator/10.res.cardcreator 2016-03-04 14:32:38 +0000
114+++ tests/plugins/Dash/cardcreator/10.res.cardcreator 2016-03-04 14:32:38 +0000
115@@ -5,7 +5,6 @@
116 property string backgroundShapeStyle: "inset";
117 property real fontScale: 1.0;
118 property var scopeStyle: null;
119- property int fixedHeaderHeight: -1;
120 property size fixedArtShapeSize: Qt.size(-1, -1);
121 readonly property string title: cardData && cardData["title"] || "";
122 property bool showHeader: true;
123@@ -57,7 +56,6 @@
124 objectName: "outerRow";
125 property real margins: units.gu(1);
126 spacing: margins;
127- height: root.fixedHeaderHeight != -1 ? root.fixedHeaderHeight : implicitHeight;
128 anchors { top: parent.top;
129 topMargin: units.gu(1);
130 left: parent.left;
131
132=== modified file 'tests/plugins/Dash/cardcreator/11.res'
133--- tests/plugins/Dash/cardcreator/11.res 2016-03-04 14:32:38 +0000
134+++ tests/plugins/Dash/cardcreator/11.res 2016-03-04 14:32:38 +0000
135@@ -132,7 +132,7 @@
136 objectName: "outerRow";
137 property real margins: units.gu(1);
138 spacing: margins;
139- height: root.fixedHeaderHeight != -1 ? root.fixedHeaderHeight : implicitHeight;
140+ height: root.fixedHeaderHeight;
141 anchors { top: artShapeHolder.bottom;
142 topMargin: units.gu(1);
143 left: parent.left;
144
145=== modified file 'tests/plugins/Dash/cardcreator/11.res.cardcreator'
146--- tests/plugins/Dash/cardcreator/11.res.cardcreator 2016-03-04 14:32:38 +0000
147+++ tests/plugins/Dash/cardcreator/11.res.cardcreator 2016-03-04 14:32:38 +0000
148@@ -5,7 +5,6 @@
149 property string backgroundShapeStyle: "inset";
150 property real fontScale: 1.0;
151 property var scopeStyle: null;
152- property int fixedHeaderHeight: -1;
153 property size fixedArtShapeSize: Qt.size(-1, -1);
154 readonly property string title: cardData && cardData["title"] || "";
155 property bool showHeader: true;
156@@ -131,7 +130,6 @@
157 objectName: "outerRow";
158 property real margins: units.gu(1);
159 spacing: margins;
160- height: root.fixedHeaderHeight != -1 ? root.fixedHeaderHeight : implicitHeight;
161 anchors { top: artShapeHolder.bottom;
162 topMargin: units.gu(1);
163 left: parent.left;
164
165=== modified file 'tests/plugins/Dash/cardcreator/2.res'
166--- tests/plugins/Dash/cardcreator/2.res 2016-03-04 14:32:38 +0000
167+++ tests/plugins/Dash/cardcreator/2.res 2016-03-04 14:32:38 +0000
168@@ -57,7 +57,7 @@
169 objectName: "outerRow";
170 property real margins: units.gu(1);
171 spacing: margins;
172- height: root.fixedHeaderHeight != -1 ? root.fixedHeaderHeight : implicitHeight;
173+ height: root.fixedHeaderHeight;
174 anchors { top: parent.top;
175 topMargin: units.gu(1);
176 left: parent.left;
177
178=== modified file 'tests/plugins/Dash/cardcreator/2.res.cardcreator'
179--- tests/plugins/Dash/cardcreator/2.res.cardcreator 2016-03-04 14:32:38 +0000
180+++ tests/plugins/Dash/cardcreator/2.res.cardcreator 2016-03-04 14:32:38 +0000
181@@ -5,7 +5,6 @@
182 property string backgroundShapeStyle: "inset";
183 property real fontScale: 1.0;
184 property var scopeStyle: null;
185- property int fixedHeaderHeight: -1;
186 property size fixedArtShapeSize: Qt.size(-1, -1);
187 readonly property string title: cardData && cardData["title"] || "";
188 property bool showHeader: true;
189@@ -57,7 +56,6 @@
190 objectName: "outerRow";
191 property real margins: units.gu(1);
192 spacing: margins;
193- height: root.fixedHeaderHeight != -1 ? root.fixedHeaderHeight : implicitHeight;
194 anchors { top: parent.top;
195 topMargin: units.gu(1);
196 left: parent.left;
197
198=== modified file 'tests/plugins/Dash/cardcreator/3.res.cardcreator'
199--- tests/plugins/Dash/cardcreator/3.res.cardcreator 2016-03-04 14:32:38 +0000
200+++ tests/plugins/Dash/cardcreator/3.res.cardcreator 2016-03-04 14:32:38 +0000
201@@ -5,7 +5,6 @@
202 property string backgroundShapeStyle: "inset";
203 property real fontScale: 1.0;
204 property var scopeStyle: null;
205- property int fixedHeaderHeight: -1;
206 property size fixedArtShapeSize: Qt.size(-1, -1);
207 readonly property string title: cardData && cardData["title"] || "";
208 property bool showHeader: true;
209
210=== modified file 'tests/plugins/Dash/cardcreator/4.res'
211--- tests/plugins/Dash/cardcreator/4.res 2016-03-04 14:32:38 +0000
212+++ tests/plugins/Dash/cardcreator/4.res 2016-03-04 14:32:38 +0000
213@@ -19,7 +19,7 @@
214 objectName: "outerRow";
215 property real margins: units.gu(1);
216 spacing: margins;
217- height: root.fixedHeaderHeight != -1 ? root.fixedHeaderHeight : implicitHeight;
218+ height: root.fixedHeaderHeight;
219 anchors { top: parent.top;
220 topMargin: units.gu(1);
221 left: parent.left;
222
223=== modified file 'tests/plugins/Dash/cardcreator/4.res.cardcreator'
224--- tests/plugins/Dash/cardcreator/4.res.cardcreator 2016-03-04 14:32:38 +0000
225+++ tests/plugins/Dash/cardcreator/4.res.cardcreator 2016-03-04 14:32:38 +0000
226@@ -5,7 +5,6 @@
227 property string backgroundShapeStyle: "inset";
228 property real fontScale: 1.0;
229 property var scopeStyle: null;
230- property int fixedHeaderHeight: -1;
231 property size fixedArtShapeSize: Qt.size(-1, -1);
232 readonly property string title: cardData && cardData["title"] || "";
233 property bool showHeader: true;
234@@ -19,7 +18,6 @@
235 objectName: "outerRow";
236 property real margins: units.gu(1);
237 spacing: margins;
238- height: root.fixedHeaderHeight != -1 ? root.fixedHeaderHeight : implicitHeight;
239 anchors { top: parent.top;
240 topMargin: units.gu(1);
241 left: parent.left;
242
243=== modified file 'tests/plugins/Dash/cardcreator/5.res'
244--- tests/plugins/Dash/cardcreator/5.res 2016-03-04 14:32:38 +0000
245+++ tests/plugins/Dash/cardcreator/5.res 2016-03-04 14:32:38 +0000
246@@ -89,7 +89,7 @@
247 }
248 Loader {
249 id: overlayLoader;
250- readonly property real overlayHeight: (fixedHeaderHeight > 0 ? fixedHeaderHeight : headerHeight) + units.gu(2);
251+ readonly property real overlayHeight: root.fixedHeaderHeight + units.gu(2);
252 anchors.fill: artShapeHolder;
253 active: artShapeLoader.active && artShapeLoader.item && artShapeLoader.item.image.status === Image.Ready || false;
254 asynchronous: true;
255
256=== modified file 'tests/plugins/Dash/cardcreator/5.res.cardcreator'
257--- tests/plugins/Dash/cardcreator/5.res.cardcreator 2016-03-04 14:32:38 +0000
258+++ tests/plugins/Dash/cardcreator/5.res.cardcreator 2016-03-04 14:32:38 +0000
259@@ -5,7 +5,6 @@
260 property string backgroundShapeStyle: "inset";
261 property real fontScale: 1.0;
262 property var scopeStyle: null;
263- property int fixedHeaderHeight: -1;
264 property size fixedArtShapeSize: Qt.size(-1, -1);
265 readonly property string title: cardData && cardData["title"] || "";
266 property bool showHeader: true;
267@@ -89,7 +88,7 @@
268 }
269 Loader {
270 id: overlayLoader;
271- readonly property real overlayHeight: (fixedHeaderHeight > 0 ? fixedHeaderHeight : headerHeight) + units.gu(2);
272+ readonly property real overlayHeight: headerHeight + units.gu(2);
273 anchors.fill: artShapeHolder;
274 active: artShapeLoader.active && artShapeLoader.item && artShapeLoader.item.image.status === Image.Ready || false;
275 asynchronous: false;
276
277=== modified file 'tests/plugins/Dash/cardcreator/6.res.cardcreator'
278--- tests/plugins/Dash/cardcreator/6.res.cardcreator 2016-03-04 14:32:38 +0000
279+++ tests/plugins/Dash/cardcreator/6.res.cardcreator 2016-03-04 14:32:38 +0000
280@@ -5,7 +5,6 @@
281 property string backgroundShapeStyle: "inset";
282 property real fontScale: 1.0;
283 property var scopeStyle: null;
284- property int fixedHeaderHeight: -1;
285 property size fixedArtShapeSize: Qt.size(-1, -1);
286 readonly property string title: cardData && cardData["title"] || "";
287 property bool showHeader: true;
288
289=== modified file 'tests/plugins/Dash/cardcreator/7.res'
290--- tests/plugins/Dash/cardcreator/7.res 2016-03-04 14:32:38 +0000
291+++ tests/plugins/Dash/cardcreator/7.res 2016-03-04 14:32:38 +0000
292@@ -57,7 +57,7 @@
293 objectName: "outerRow";
294 property real margins: units.gu(1);
295 spacing: margins;
296- height: root.fixedHeaderHeight != -1 ? root.fixedHeaderHeight : implicitHeight;
297+ height: root.fixedHeaderHeight;
298 anchors { top: parent.top;
299 topMargin: units.gu(1);
300 left: parent.left;
301
302=== modified file 'tests/plugins/Dash/cardcreator/7.res.cardcreator'
303--- tests/plugins/Dash/cardcreator/7.res.cardcreator 2016-03-04 14:32:38 +0000
304+++ tests/plugins/Dash/cardcreator/7.res.cardcreator 2016-03-04 14:32:38 +0000
305@@ -5,7 +5,6 @@
306 property string backgroundShapeStyle: "inset";
307 property real fontScale: 1.0;
308 property var scopeStyle: null;
309- property int fixedHeaderHeight: -1;
310 property size fixedArtShapeSize: Qt.size(-1, -1);
311 readonly property string title: cardData && cardData["title"] || "";
312 property bool showHeader: true;
313@@ -57,7 +56,6 @@
314 objectName: "outerRow";
315 property real margins: units.gu(1);
316 spacing: margins;
317- height: root.fixedHeaderHeight != -1 ? root.fixedHeaderHeight : implicitHeight;
318 anchors { top: parent.top;
319 topMargin: units.gu(1);
320 left: parent.left;
321
322=== modified file 'tests/plugins/Dash/cardcreator/8.res'
323--- tests/plugins/Dash/cardcreator/8.res 2016-03-04 14:32:38 +0000
324+++ tests/plugins/Dash/cardcreator/8.res 2016-03-04 14:32:38 +0000
325@@ -57,7 +57,7 @@
326 objectName: "outerRow";
327 property real margins: units.gu(1);
328 spacing: margins;
329- height: root.fixedHeaderHeight != -1 ? root.fixedHeaderHeight : implicitHeight;
330+ height: root.fixedHeaderHeight;
331 anchors { top: parent.top;
332 topMargin: units.gu(1);
333 left: parent.left;
334
335=== modified file 'tests/plugins/Dash/cardcreator/8.res.cardcreator'
336--- tests/plugins/Dash/cardcreator/8.res.cardcreator 2016-03-04 14:32:38 +0000
337+++ tests/plugins/Dash/cardcreator/8.res.cardcreator 2016-03-04 14:32:38 +0000
338@@ -5,7 +5,6 @@
339 property string backgroundShapeStyle: "inset";
340 property real fontScale: 1.0;
341 property var scopeStyle: null;
342- property int fixedHeaderHeight: -1;
343 property size fixedArtShapeSize: Qt.size(-1, -1);
344 readonly property string title: cardData && cardData["title"] || "";
345 property bool showHeader: true;
346@@ -57,7 +56,6 @@
347 objectName: "outerRow";
348 property real margins: units.gu(1);
349 spacing: margins;
350- height: root.fixedHeaderHeight != -1 ? root.fixedHeaderHeight : implicitHeight;
351 anchors { top: parent.top;
352 topMargin: units.gu(1);
353 left: parent.left;
354
355=== modified file 'tests/plugins/Dash/cardcreator/9.res'
356--- tests/plugins/Dash/cardcreator/9.res 2016-03-04 14:32:38 +0000
357+++ tests/plugins/Dash/cardcreator/9.res 2016-03-04 14:32:38 +0000
358@@ -70,7 +70,7 @@
359 id: audioButton;
360 anchors.fill: undefined;
361 width: height;
362- height: (root.fixedHeaderHeight > 0 ? root.fixedHeaderHeight : headerHeight) + 2 * units.gu(1);
363+ height: root.fixedHeaderHeight + 2 * units.gu(1);
364 readonly property url source: (cardData["quickPreviewData"] && cardData["quickPreviewData"]["uri"]) || "";
365 UbuntuShape {
366 anchors.fill: parent;
367
368=== modified file 'tests/plugins/Dash/cardcreator/9.res.cardcreator'
369--- tests/plugins/Dash/cardcreator/9.res.cardcreator 2016-03-04 14:32:38 +0000
370+++ tests/plugins/Dash/cardcreator/9.res.cardcreator 2016-03-04 14:32:38 +0000
371@@ -5,7 +5,6 @@
372 property string backgroundShapeStyle: "inset";
373 property real fontScale: 1.0;
374 property var scopeStyle: null;
375- property int fixedHeaderHeight: -1;
376 property size fixedArtShapeSize: Qt.size(-1, -1);
377 readonly property string title: cardData && cardData["title"] || "";
378 property bool showHeader: true;
379@@ -70,7 +69,7 @@
380 id: audioButton;
381 anchors.fill: undefined;
382 width: height;
383- height: (root.fixedHeaderHeight > 0 ? root.fixedHeaderHeight : headerHeight) + 2 * units.gu(1);
384+ height: headerHeight + 2 * units.gu(1);
385 readonly property url source: (cardData["quickPreviewData"] && cardData["quickPreviewData"]["uri"]) || "";
386 UbuntuShape {
387 anchors.fill: parent;

Subscribers

People subscribed via source and target branches