Unity 8

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

  1. noArtShapeSizeForRegularCards
  2. Merge into trunk
Proposed by Albert Astals Cid
Status: Merged
Approved by: Andrea Cimitan
Approved revision: 2552
Merged at revision: 2620
Proposed branch: lp:~aacid/unity8/noArtShapeSizeForRegularCards
Merge into: lp:unity8
Prerequisite: lp:~aacid/unity8/noImplicitHeightForCardGridCards
Diff against target: 169 lines (+3/-15)
13 files modified
plugins/Dash/CardCreator.js (+3/-3)
tests/plugins/Dash/cardcreator/1.res (+0/-1)
tests/plugins/Dash/cardcreator/10.res (+0/-1)
tests/plugins/Dash/cardcreator/11.res (+0/-1)
tests/plugins/Dash/cardcreator/12.res (+0/-1)
tests/plugins/Dash/cardcreator/2.res (+0/-1)
tests/plugins/Dash/cardcreator/3.res (+0/-1)
tests/plugins/Dash/cardcreator/4.res (+0/-1)
tests/plugins/Dash/cardcreator/5.res (+0/-1)
tests/plugins/Dash/cardcreator/6.res (+0/-1)
tests/plugins/Dash/cardcreator/7.res (+0/-1)
tests/plugins/Dash/cardcreator/8.res (+0/-1)
tests/plugins/Dash/cardcreator/9.res (+0/-1)
To merge this branch: bzr merge lp:~aacid/unity8/noArtShapeSizeForRegularCards
Reviewer Review Type Date Requested Status
Andrea Cimitan (community) Approve
Unity8 CI Bot continuous-integration Needs Fixing
Review via email: mp+301054@code.launchpad.net

Commit message

Remove artShapeSize from non cardtool cards

artShapeSize is only used in the cardtool card to read the value them we pass down in fixedArtShapeSize

According to qmlprofiler evaluating this useless binding accounts for ~0.5% when scrolling up and down a very long scope

Description of the change

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

 * 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.
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2549
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1805/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/2359
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1267
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1267
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/1267
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2387
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2274
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2274
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2274
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2267
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2267/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2267
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2267/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2267
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2267/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2267
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2267/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2267
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2267/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2267
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2267/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2267
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2267/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2267
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2267/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2267
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2267/artifact/output/*zip*/output.zip

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

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

Merge

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

FAILED: Continuous integration, rev:2550
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1906/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/2482/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2510
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2396
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2396
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2396
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2389
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2389/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2389
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2389/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2389/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2389
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2389/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2389
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2389/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2389
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2389/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2389
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2389/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2389
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2389/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2389
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2389/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Andrea Cimitan (cimi) :
review: Needs Fixing
lp:~aacid/unity8/noArtShapeSizeForRegularCards updated
2551. By Albert Astals Cid

Combine the ifs

2552. By Albert Astals Cid

cimi prefers it this way

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

Fixed the review comments

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

FAILED: Continuous integration, rev:2552
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2027/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/2658
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1458
    FAILURE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1458/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/1458
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2686
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2559
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2559
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2559
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2553
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2553/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2553
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2553/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2553
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2553/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2553
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2553/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2553
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2553/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2553
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2553/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2553
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2553/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2553
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2553/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2553
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2553/artifact/output/*zip*/output.zip

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

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'plugins/Dash/CardCreator.js'
--- plugins/Dash/CardCreator.js 2016-08-08 08:32:27 +0000
+++ plugins/Dash/CardCreator.js 2016-08-24 15:51:21 +0000
@@ -506,10 +506,10 @@
506 }506 }
507507
508 if (hasArt) {508 if (hasArt) {
509 code += 'readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);\n';
510
511 var artShapeAspect;509 var artShapeAspect;
512 if (isCardTool) {510 if (isCardTool) {
511 code += 'readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);\n';
512
513 var artShapeAspect = components["art"] && components["art"]["aspect-ratio"] || 1;513 var artShapeAspect = components["art"] && components["art"]["aspect-ratio"] || 1;
514 if (isNaN(artShapeAspect)) {514 if (isNaN(artShapeAspect)) {
515 artShapeAspect = 1;515 artShapeAspect = 1;
@@ -573,7 +573,7 @@
573 .arg(artShapeHolderShapeCode)573 .arg(artShapeHolderShapeCode)
574 .arg(fallbackStatusCode)574 .arg(fallbackStatusCode)
575 .arg(fallbackURICode);575 .arg(fallbackURICode);
576 } else {576 } else if (isCardTool) {
577 code += 'readonly property size artShapeSize: Qt.size(-1, -1);\n'577 code += 'readonly property size artShapeSize: Qt.size(-1, -1);\n'
578 }578 }
579579
580580
=== modified file 'tests/plugins/Dash/cardcreator/1.res'
--- tests/plugins/Dash/cardcreator/1.res 2016-06-28 15:38:21 +0000
+++ tests/plugins/Dash/cardcreator/1.res 2016-08-24 15:51:21 +0000
@@ -11,7 +11,6 @@
11 property int fixedHeaderHeight: -1; 11 property int fixedHeaderHeight: -1;
12 property size fixedArtShapeSize: Qt.size(-1, -1); 12 property size fixedArtShapeSize: Qt.size(-1, -1);
13signal action(var actionId);13signal action(var actionId);
14readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);
15Loader {14Loader {
16 id: artShapeLoader; 15 id: artShapeLoader;
17 height: root.fixedArtShapeSize.height; 16 height: root.fixedArtShapeSize.height;
1817
=== modified file 'tests/plugins/Dash/cardcreator/10.res'
--- tests/plugins/Dash/cardcreator/10.res 2016-05-26 14:53:20 +0000
+++ tests/plugins/Dash/cardcreator/10.res 2016-08-24 15:51:21 +0000
@@ -49,7 +49,6 @@
49 } 49 }
50 } 50 }
51 }51 }
52readonly property size artShapeSize: Qt.size(-1, -1);
53readonly property int headerHeight: row.height;52readonly property int headerHeight: row.height;
54Row { 53Row {
55 id: row; 54 id: row;
5655
=== modified file 'tests/plugins/Dash/cardcreator/11.res'
--- tests/plugins/Dash/cardcreator/11.res 2016-06-28 15:38:21 +0000
+++ tests/plugins/Dash/cardcreator/11.res 2016-08-24 15:51:21 +0000
@@ -49,7 +49,6 @@
49 } 49 }
50 } 50 }
51 }51 }
52readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);
53Loader {52Loader {
54 id: artShapeLoader; 53 id: artShapeLoader;
55 height: root.fixedArtShapeSize.height; 54 height: root.fixedArtShapeSize.height;
5655
=== modified file 'tests/plugins/Dash/cardcreator/12.res'
--- tests/plugins/Dash/cardcreator/12.res 2016-06-28 15:38:21 +0000
+++ tests/plugins/Dash/cardcreator/12.res 2016-08-24 15:51:21 +0000
@@ -11,7 +11,6 @@
11 property int fixedHeaderHeight: -1; 11 property int fixedHeaderHeight: -1;
12 property size fixedArtShapeSize: Qt.size(-1, -1); 12 property size fixedArtShapeSize: Qt.size(-1, -1);
13signal action(var actionId);13signal action(var actionId);
14readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);
15Loader {14Loader {
16 id: artShapeLoader; 15 id: artShapeLoader;
17 height: root.fixedArtShapeSize.height; 16 height: root.fixedArtShapeSize.height;
1817
=== modified file 'tests/plugins/Dash/cardcreator/2.res'
--- tests/plugins/Dash/cardcreator/2.res 2016-05-26 14:53:20 +0000
+++ tests/plugins/Dash/cardcreator/2.res 2016-08-24 15:51:21 +0000
@@ -49,7 +49,6 @@
49 } 49 }
50 } 50 }
51 }51 }
52readonly property size artShapeSize: Qt.size(-1, -1);
53readonly property int headerHeight: row.height;52readonly property int headerHeight: row.height;
54Row { 53Row {
55 id: row; 54 id: row;
5655
=== modified file 'tests/plugins/Dash/cardcreator/3.res'
--- tests/plugins/Dash/cardcreator/3.res 2016-08-03 15:49:54 +0000
+++ tests/plugins/Dash/cardcreator/3.res 2016-08-24 15:51:21 +0000
@@ -11,7 +11,6 @@
11 property int fixedHeaderHeight: -1; 11 property int fixedHeaderHeight: -1;
12 property size fixedArtShapeSize: Qt.size(-1, -1); 12 property size fixedArtShapeSize: Qt.size(-1, -1);
13signal action(var actionId);13signal action(var actionId);
14readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);
15Loader {14Loader {
16 id: artShapeLoader; 15 id: artShapeLoader;
17 height: root.fixedArtShapeSize.height; 16 height: root.fixedArtShapeSize.height;
1817
=== modified file 'tests/plugins/Dash/cardcreator/4.res'
--- tests/plugins/Dash/cardcreator/4.res 2016-05-26 14:53:20 +0000
+++ tests/plugins/Dash/cardcreator/4.res 2016-08-24 15:51:21 +0000
@@ -11,7 +11,6 @@
11 property int fixedHeaderHeight: -1; 11 property int fixedHeaderHeight: -1;
12 property size fixedArtShapeSize: Qt.size(-1, -1); 12 property size fixedArtShapeSize: Qt.size(-1, -1);
13signal action(var actionId);13signal action(var actionId);
14readonly property size artShapeSize: Qt.size(-1, -1);
15readonly property int headerHeight: row.height;14readonly property int headerHeight: row.height;
16Row { 15Row {
17 id: row; 16 id: row;
1817
=== modified file 'tests/plugins/Dash/cardcreator/5.res'
--- tests/plugins/Dash/cardcreator/5.res 2016-06-28 15:38:21 +0000
+++ tests/plugins/Dash/cardcreator/5.res 2016-08-24 15:51:21 +0000
@@ -11,7 +11,6 @@
11 property int fixedHeaderHeight: -1; 11 property int fixedHeaderHeight: -1;
12 property size fixedArtShapeSize: Qt.size(-1, -1); 12 property size fixedArtShapeSize: Qt.size(-1, -1);
13signal action(var actionId);13signal action(var actionId);
14readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);
15Loader {14Loader {
16 id: artShapeLoader; 15 id: artShapeLoader;
17 height: root.fixedArtShapeSize.height; 16 height: root.fixedArtShapeSize.height;
1817
=== modified file 'tests/plugins/Dash/cardcreator/6.res'
--- tests/plugins/Dash/cardcreator/6.res 2016-05-26 14:53:20 +0000
+++ tests/plugins/Dash/cardcreator/6.res 2016-08-24 15:51:21 +0000
@@ -49,7 +49,6 @@
49 } 49 }
50 } 50 }
51 }51 }
52readonly property size artShapeSize: Qt.size(-1, -1);
53readonly property int headerHeight: titleLabel.height + subtitleLabel.height + subtitleLabel.anchors.topMargin;52readonly property int headerHeight: titleLabel.height + subtitleLabel.height + subtitleLabel.anchors.topMargin;
54Item { 53Item {
55 id: headerTitleContainer; 54 id: headerTitleContainer;
5655
=== modified file 'tests/plugins/Dash/cardcreator/7.res'
--- tests/plugins/Dash/cardcreator/7.res 2016-05-26 14:53:20 +0000
+++ tests/plugins/Dash/cardcreator/7.res 2016-08-24 15:51:21 +0000
@@ -49,7 +49,6 @@
49 } 49 }
50 } 50 }
51 }51 }
52readonly property size artShapeSize: Qt.size(-1, -1);
53readonly property int headerHeight: row.height;52readonly property int headerHeight: row.height;
54Row { 53Row {
55 id: row; 54 id: row;
5655
=== modified file 'tests/plugins/Dash/cardcreator/8.res'
--- tests/plugins/Dash/cardcreator/8.res 2016-05-26 14:53:20 +0000
+++ tests/plugins/Dash/cardcreator/8.res 2016-08-24 15:51:21 +0000
@@ -49,7 +49,6 @@
49 } 49 }
50 } 50 }
51 }51 }
52readonly property size artShapeSize: Qt.size(-1, -1);
53readonly property int headerHeight: row.height;52readonly property int headerHeight: row.height;
54Row { 53Row {
55 id: row; 54 id: row;
5655
=== modified file 'tests/plugins/Dash/cardcreator/9.res'
--- tests/plugins/Dash/cardcreator/9.res 2016-05-20 14:53:04 +0000
+++ tests/plugins/Dash/cardcreator/9.res 2016-08-24 15:51:21 +0000
@@ -11,7 +11,6 @@
11 property int fixedHeaderHeight: -1; 11 property int fixedHeaderHeight: -1;
12 property size fixedArtShapeSize: Qt.size(-1, -1); 12 property size fixedArtShapeSize: Qt.size(-1, -1);
13signal action(var actionId);13signal action(var actionId);
14readonly property size artShapeSize: Qt.size(-1, -1);
15readonly property int headerHeight: titleLabel.height + subtitleLabel.height + subtitleLabel.anchors.topMargin + audioProgressBar.height + audioProgressBar.anchors.topMargin;14readonly property int headerHeight: titleLabel.height + subtitleLabel.height + subtitleLabel.anchors.topMargin + audioProgressBar.height + audioProgressBar.anchors.topMargin;
16Label { 15Label {
17 id: titleLabel; 16 id: titleLabel;

Subscribers

People subscribed via source and target branches