Unity 8

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

  1. touchdownLoader
  2. Merge into trunk
Proposed by Albert Astals Cid
Status: Merged
Approved by: Josh Arenson
Approved revision: 2546
Merged at revision: 2617
Proposed branch: lp:~aacid/unity8/touchdownLoader
Merge into: lp:unity8
Diff against target: 466 lines (+151/-106)
17 files modified
plugins/Dash/CardCreator.js (+8/-6)
tests/plugins/Dash/cardcreator/1.res (+8/-6)
tests/plugins/Dash/cardcreator/1.res.cardcreator (+8/-6)
tests/plugins/Dash/cardcreator/11.res (+10/-8)
tests/plugins/Dash/cardcreator/11.res.cardcreator (+10/-8)
tests/plugins/Dash/cardcreator/12.res (+8/-6)
tests/plugins/Dash/cardcreator/12.res.cardcreator (+8/-6)
tests/plugins/Dash/cardcreator/4.res (+8/-6)
tests/plugins/Dash/cardcreator/4.res.cardcreator (+8/-6)
tests/plugins/Dash/cardcreator/6.res (+8/-6)
tests/plugins/Dash/cardcreator/6.res.cardcreator (+8/-6)
tests/plugins/Dash/cardcreator/8.res (+8/-6)
tests/plugins/Dash/cardcreator/8.res.cardcreator (+8/-6)
tests/plugins/Dash/cardcreator/9.res (+10/-8)
tests/plugins/Dash/cardcreator/9.res.cardcreator (+10/-8)
tests/qmltests/Dash/tst_Card.qml (+7/-2)
tests/qmltests/Dash/tst_GenericScopeView.qml (+16/-6)
To merge this branch: bzr merge lp:~aacid/unity8/touchdownLoader
Reviewer Review Type Date Requested Status
Unity8 CI Bot continuous-integration Approve
Josh Arenson Approve
Andrea Cimitan (community) Approve
Michael Terry Approve
Review via email: mp+300735@code.launchpad.net

Commit message

Put the touchdown shape inside a loader

We only create the shape when needed, saving a bit of CPU time when we're just scrolling around the scopes

Doesn't seem to make the touchdown appear time on press noticeably slower

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

FAILED: Continuous integration, rev:2543
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1782/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/2336
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1249
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1249
    FAILURE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/1249/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2364
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2254
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2254
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2254
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2248
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2248/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2248
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2248/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2248
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2248/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2248
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2248/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2248
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2248/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2248
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2248/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2248
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2248/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2248
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2248/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2248
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2248/artifact/output/*zip*/output.zip

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

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

Merge unity8

2545. By Albert Astals Cid

Adapt test to code changes

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

FAILED: Continuous integration, rev:2543
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1800/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/2354
    FAILURE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1263/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1263/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/1263/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2382
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2269
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2269
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2269
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2262
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2262/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2262
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2262/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2262
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2262/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2262
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2262/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2262
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2262/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2262
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2262/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2262
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2262/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2262
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2262/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2262
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2262/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2545
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1802/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/2356
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1264
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1264
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/1264
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2384
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2271
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2271
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2271
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2264
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2264/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2264
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2264/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2264
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2264/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2264
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2264/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2264
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2264/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2264
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2264/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2264
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2264/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2264
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2264/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2264
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2264/artifact/output/*zip*/output.zip

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

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

Merge

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

FAILED: Continuous integration, rev:2546
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1902/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/2478/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2506
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2392
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2392
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2392
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2385
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2385/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2385
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2385/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2385/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2385
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2385/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2385
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2385/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2385
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2385/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2385
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2385/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2385
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2385/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2385
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2385/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Michael Terry (mterry) wrote :

LGTM. Tested and it seems just as fast. Thanks!

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

fine with the change too

review: Approve
Revision history for this message
Josh Arenson (josharenson) wrote :

lgtm as well!

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

PASSED: Continuous integration, rev:2546
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2022/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/2653
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1454
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1454
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/1454
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2681
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2554
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2554
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2554
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2548
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2548/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2548
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2548/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2548
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2548/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2548
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2548/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2548
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2548/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2548
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2548/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2548
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2548/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2548
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2548/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2548
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2548/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

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-08-03 15:49:54 +0000
3+++ plugins/Dash/CardCreator.js 2016-08-08 08:57:51 +0000
4@@ -331,13 +331,15 @@
5 }\n';
6
7 // %1 is used as anchors of touchdown effect
8-var kTouchdownCode = 'UbuntuShape { \n\
9- id: touchdown; \n\
10- objectName: "touchdown"; \n\
11+var kTouchdownCode = 'Loader { \n\
12+ active: root.pressed; \n\
13 anchors { %1 } \n\
14- visible: root.pressed; \n\
15- radius: "medium"; \n\
16- borderSource: "radius_pressed.sci" \n\
17+ sourceComponent: UbuntuShape { \n\
18+ objectName: "touchdown"; \n\
19+ anchors.fill: parent; \n\
20+ radius: "medium"; \n\
21+ borderSource: "radius_pressed.sci" \n\
22+ } \n\
23 }\n';
24
25 // %1 is used as anchors of subtitleLabel
26
27=== modified file 'tests/plugins/Dash/cardcreator/1.res'
28--- tests/plugins/Dash/cardcreator/1.res 2016-06-28 15:38:21 +0000
29+++ tests/plugins/Dash/cardcreator/1.res 2016-08-08 08:57:51 +0000
30@@ -69,13 +69,15 @@
31 font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
32 horizontalAlignment: Text.AlignHCenter;
33 }
34-UbuntuShape {
35- id: touchdown;
36- objectName: "touchdown";
37+Loader {
38+ active: root.pressed;
39 anchors { fill: artShapeLoader }
40- visible: root.pressed;
41- radius: "medium";
42- borderSource: "radius_pressed.sci"
43+ sourceComponent: UbuntuShape {
44+ objectName: "touchdown";
45+ anchors.fill: parent;
46+ radius: "medium";
47+ borderSource: "radius_pressed.sci"
48+ }
49 }
50 implicitHeight: titleLabel.y + titleLabel.height + units.gu(1);
51 }
52
53=== modified file 'tests/plugins/Dash/cardcreator/1.res.cardcreator'
54--- tests/plugins/Dash/cardcreator/1.res.cardcreator 2016-06-28 15:50:44 +0000
55+++ tests/plugins/Dash/cardcreator/1.res.cardcreator 2016-08-08 08:57:51 +0000
56@@ -65,13 +65,15 @@
57 font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
58 horizontalAlignment: Text.AlignHCenter;
59 }
60-UbuntuShape {
61- id: touchdown;
62- objectName: "touchdown";
63+Loader {
64+ active: root.pressed;
65 anchors { fill: artShapeLoader }
66- visible: root.pressed;
67- radius: "medium";
68- borderSource: "radius_pressed.sci"
69+ sourceComponent: UbuntuShape {
70+ objectName: "touchdown";
71+ anchors.fill: parent;
72+ radius: "medium";
73+ borderSource: "radius_pressed.sci"
74+ }
75 }
76 implicitHeight: titleLabel.y + titleLabel.height + units.gu(1);
77 }
78
79=== modified file 'tests/plugins/Dash/cardcreator/11.res'
80--- tests/plugins/Dash/cardcreator/11.res 2016-06-28 15:38:21 +0000
81+++ tests/plugins/Dash/cardcreator/11.res 2016-08-08 08:57:51 +0000
82@@ -163,13 +163,15 @@
83
84 ]
85 }
86-UbuntuShape {
87- id: touchdown;
88- objectName: "touchdown";
89- anchors { fill: backgroundLoader }
90- visible: root.pressed;
91- radius: "medium";
92- borderSource: "radius_pressed.sci"
93- }
94+Loader {
95+ active: root.pressed;
96+ anchors { fill: backgroundLoader }
97+ sourceComponent: UbuntuShape {
98+ objectName: "touchdown";
99+ anchors.fill: parent;
100+ radius: "medium";
101+ borderSource: "radius_pressed.sci"
102+ }
103+}
104 implicitHeight: row.y + row.height + units.gu(1);
105 }
106
107=== modified file 'tests/plugins/Dash/cardcreator/11.res.cardcreator'
108--- tests/plugins/Dash/cardcreator/11.res.cardcreator 2016-06-28 15:50:44 +0000
109+++ tests/plugins/Dash/cardcreator/11.res.cardcreator 2016-08-08 08:57:51 +0000
110@@ -156,13 +156,15 @@
111
112 ]
113 }
114-UbuntuShape {
115- id: touchdown;
116- objectName: "touchdown";
117- anchors { fill: backgroundLoader }
118- visible: root.pressed;
119- radius: "medium";
120- borderSource: "radius_pressed.sci"
121- }
122+Loader {
123+ active: root.pressed;
124+ anchors { fill: backgroundLoader }
125+ sourceComponent: UbuntuShape {
126+ objectName: "touchdown";
127+ anchors.fill: parent;
128+ radius: "medium";
129+ borderSource: "radius_pressed.sci"
130+ }
131+}
132 implicitHeight: row.y + row.height + units.gu(1);
133 }
134
135=== modified file 'tests/plugins/Dash/cardcreator/12.res'
136--- tests/plugins/Dash/cardcreator/12.res 2016-06-28 15:38:21 +0000
137+++ tests/plugins/Dash/cardcreator/12.res 2016-08-08 08:57:51 +0000
138@@ -95,13 +95,15 @@
139 model: cardData && cardData["socialActions"];
140 onClicked: root.action(actionId);
141 }
142-UbuntuShape {
143- id: touchdown;
144- objectName: "touchdown";
145+Loader {
146+ active: root.pressed;
147 anchors { fill: artShapeLoader }
148- visible: root.pressed;
149- radius: "medium";
150- borderSource: "radius_pressed.sci"
151+ sourceComponent: UbuntuShape {
152+ objectName: "touchdown";
153+ anchors.fill: parent;
154+ radius: "medium";
155+ borderSource: "radius_pressed.sci"
156+ }
157 }
158 implicitHeight: socialActionsRow.y + socialActionsRow.height + units.gu(1);
159 }
160
161=== modified file 'tests/plugins/Dash/cardcreator/12.res.cardcreator'
162--- tests/plugins/Dash/cardcreator/12.res.cardcreator 2016-06-28 15:50:44 +0000
163+++ tests/plugins/Dash/cardcreator/12.res.cardcreator 2016-08-08 08:57:51 +0000
164@@ -91,13 +91,15 @@
165 model: cardData && cardData["socialActions"];
166 onClicked: root.action(actionId);
167 }
168-UbuntuShape {
169- id: touchdown;
170- objectName: "touchdown";
171+Loader {
172+ active: root.pressed;
173 anchors { fill: artShapeLoader }
174- visible: root.pressed;
175- radius: "medium";
176- borderSource: "radius_pressed.sci"
177+ sourceComponent: UbuntuShape {
178+ objectName: "touchdown";
179+ anchors.fill: parent;
180+ radius: "medium";
181+ borderSource: "radius_pressed.sci"
182+ }
183 }
184 implicitHeight: socialActionsRow.y + socialActionsRow.height + units.gu(1);
185 }
186
187=== modified file 'tests/plugins/Dash/cardcreator/4.res'
188--- tests/plugins/Dash/cardcreator/4.res 2016-05-26 14:53:20 +0000
189+++ tests/plugins/Dash/cardcreator/4.res 2016-08-08 08:57:51 +0000
190@@ -98,13 +98,15 @@
191 }
192 ]
193 }
194-UbuntuShape {
195- id: touchdown;
196- objectName: "touchdown";
197+Loader {
198+ active: root.pressed;
199 anchors { fill: root }
200- visible: root.pressed;
201- radius: "medium";
202- borderSource: "radius_pressed.sci"
203+ sourceComponent: UbuntuShape {
204+ objectName: "touchdown";
205+ anchors.fill: parent;
206+ radius: "medium";
207+ borderSource: "radius_pressed.sci"
208+ }
209 }
210 implicitHeight: row.y + row.height + units.gu(1);
211 }
212
213=== modified file 'tests/plugins/Dash/cardcreator/4.res.cardcreator'
214--- tests/plugins/Dash/cardcreator/4.res.cardcreator 2016-05-26 14:53:20 +0000
215+++ tests/plugins/Dash/cardcreator/4.res.cardcreator 2016-08-08 08:57:51 +0000
216@@ -95,13 +95,15 @@
217 }
218 ]
219 }
220-UbuntuShape {
221- id: touchdown;
222- objectName: "touchdown";
223+Loader {
224+ active: root.pressed;
225 anchors { fill: root }
226- visible: root.pressed;
227- radius: "medium";
228- borderSource: "radius_pressed.sci"
229+ sourceComponent: UbuntuShape {
230+ objectName: "touchdown";
231+ anchors.fill: parent;
232+ radius: "medium";
233+ borderSource: "radius_pressed.sci"
234+ }
235 }
236 implicitHeight: row.y + row.height + units.gu(1);
237 }
238
239=== modified file 'tests/plugins/Dash/cardcreator/6.res'
240--- tests/plugins/Dash/cardcreator/6.res 2016-05-26 14:53:20 +0000
241+++ tests/plugins/Dash/cardcreator/6.res 2016-08-08 08:57:51 +0000
242@@ -114,13 +114,15 @@
243
244 ]
245 }
246-UbuntuShape {
247- id: touchdown;
248- objectName: "touchdown";
249+Loader {
250+ active: root.pressed;
251 anchors { fill: backgroundLoader }
252- visible: root.pressed;
253- radius: "medium";
254- borderSource: "radius_pressed.sci"
255+ sourceComponent: UbuntuShape {
256+ objectName: "touchdown";
257+ anchors.fill: parent;
258+ radius: "medium";
259+ borderSource: "radius_pressed.sci"
260+ }
261 }
262 implicitHeight: headerTitleContainer.y + headerTitleContainer.height + units.gu(1);
263 }
264
265=== modified file 'tests/plugins/Dash/cardcreator/6.res.cardcreator'
266--- tests/plugins/Dash/cardcreator/6.res.cardcreator 2016-05-26 14:53:20 +0000
267+++ tests/plugins/Dash/cardcreator/6.res.cardcreator 2016-08-08 08:57:51 +0000
268@@ -112,13 +112,15 @@
269
270 ]
271 }
272-UbuntuShape {
273- id: touchdown;
274- objectName: "touchdown";
275+Loader {
276+ active: root.pressed;
277 anchors { fill: backgroundLoader }
278- visible: root.pressed;
279- radius: "medium";
280- borderSource: "radius_pressed.sci"
281+ sourceComponent: UbuntuShape {
282+ objectName: "touchdown";
283+ anchors.fill: parent;
284+ radius: "medium";
285+ borderSource: "radius_pressed.sci"
286+ }
287 }
288 implicitHeight: headerTitleContainer.y + headerTitleContainer.height + units.gu(1);
289 }
290
291=== modified file 'tests/plugins/Dash/cardcreator/8.res'
292--- tests/plugins/Dash/cardcreator/8.res 2016-05-26 14:53:20 +0000
293+++ tests/plugins/Dash/cardcreator/8.res 2016-08-08 08:57:51 +0000
294@@ -96,13 +96,15 @@
295
296 ]
297 }
298-UbuntuShape {
299- id: touchdown;
300- objectName: "touchdown";
301+Loader {
302+ active: root.pressed;
303 anchors { fill: backgroundLoader }
304- visible: root.pressed;
305- radius: "medium";
306- borderSource: "radius_pressed.sci"
307+ sourceComponent: UbuntuShape {
308+ objectName: "touchdown";
309+ anchors.fill: parent;
310+ radius: "medium";
311+ borderSource: "radius_pressed.sci"
312+ }
313 }
314 implicitHeight: row.y + row.height + units.gu(1);
315 }
316
317=== modified file 'tests/plugins/Dash/cardcreator/8.res.cardcreator'
318--- tests/plugins/Dash/cardcreator/8.res.cardcreator 2016-05-26 14:53:20 +0000
319+++ tests/plugins/Dash/cardcreator/8.res.cardcreator 2016-08-08 08:57:51 +0000
320@@ -93,13 +93,15 @@
321
322 ]
323 }
324-UbuntuShape {
325- id: touchdown;
326- objectName: "touchdown";
327+Loader {
328+ active: root.pressed;
329 anchors { fill: backgroundLoader }
330- visible: root.pressed;
331- radius: "medium";
332- borderSource: "radius_pressed.sci"
333+ sourceComponent: UbuntuShape {
334+ objectName: "touchdown";
335+ anchors.fill: parent;
336+ radius: "medium";
337+ borderSource: "radius_pressed.sci"
338+ }
339 }
340 implicitHeight: row.y + row.height + units.gu(1);
341 }
342
343=== modified file 'tests/plugins/Dash/cardcreator/9.res'
344--- tests/plugins/Dash/cardcreator/9.res 2016-05-20 14:53:04 +0000
345+++ tests/plugins/Dash/cardcreator/9.res 2016-08-08 08:57:51 +0000
346@@ -107,13 +107,15 @@
347 onPressAndHold: {
348 root.pressAndHold();
349 }
350- }UbuntuShape {
351- id: touchdown;
352- objectName: "touchdown";
353- anchors { fill: root }
354- visible: root.pressed;
355- radius: "medium";
356- borderSource: "radius_pressed.sci"
357- }
358+ }Loader {
359+ active: root.pressed;
360+ anchors { fill: root }
361+ sourceComponent: UbuntuShape {
362+ objectName: "touchdown";
363+ anchors.fill: parent;
364+ radius: "medium";
365+ borderSource: "radius_pressed.sci"
366+ }
367+}
368 implicitHeight: audioButton.height;
369 }
370
371=== modified file 'tests/plugins/Dash/cardcreator/9.res.cardcreator'
372--- tests/plugins/Dash/cardcreator/9.res.cardcreator 2016-05-20 14:53:04 +0000
373+++ tests/plugins/Dash/cardcreator/9.res.cardcreator 2016-08-08 08:57:51 +0000
374@@ -105,13 +105,15 @@
375 onPressAndHold: {
376 root.pressAndHold();
377 }
378- }UbuntuShape {
379- id: touchdown;
380- objectName: "touchdown";
381- anchors { fill: root }
382- visible: root.pressed;
383- radius: "medium";
384- borderSource: "radius_pressed.sci"
385- }
386+ }Loader {
387+ active: root.pressed;
388+ anchors { fill: root }
389+ sourceComponent: UbuntuShape {
390+ objectName: "touchdown";
391+ anchors.fill: parent;
392+ radius: "medium";
393+ borderSource: "radius_pressed.sci"
394+ }
395+}
396 implicitHeight: audioButton.height;
397 }
398
399=== modified file 'tests/qmltests/Dash/tst_Card.qml'
400--- tests/qmltests/Dash/tst_Card.qml 2016-06-02 08:10:48 +0000
401+++ tests/qmltests/Dash/tst_Card.qml 2016-08-08 08:57:51 +0000
402@@ -618,12 +618,17 @@
403 waitForRendering(card);
404
405 var touchdown = findChild(card, "touchdown");
406+ compare(touchdown, null);
407
408- compare(touchdown.visible, false);
409 mousePress(card);
410+
411+ touchdown = findChild(card, "touchdown");
412 compare(touchdown.visible, true);
413+
414 mouseRelease(card);
415- compare(touchdown.visible, false);
416+
417+ touchdown = findChild(card, "touchdown");
418+ compare(touchdown, null);
419 }
420
421 function test_paddings_data() {
422
423=== modified file 'tests/qmltests/Dash/tst_GenericScopeView.qml'
424--- tests/qmltests/Dash/tst_GenericScopeView.qml 2016-06-29 14:45:18 +0000
425+++ tests/qmltests/Dash/tst_GenericScopeView.qml 2016-08-08 08:57:51 +0000
426@@ -642,11 +642,15 @@
427 var item0 = findChild(cardGrid, "delegate0");
428 waitForRendering(item0);
429 compare(item0.enabled, false);
430+
431 var touchdown = findChild(item0, "touchdown");
432+ compare(touchdown, null);
433
434- compare(touchdown.visible, false);
435 mousePress(item0);
436- compare(touchdown.visible, false);
437+
438+ touchdown = findChild(item0, "touchdown");
439+ compare(touchdown, null);
440+
441 mouseRelease(item0);
442
443 cardTool.template["non-interactive"] = false;
444@@ -656,13 +660,19 @@
445 waitForRendering(category0);
446 item0 = findChild(cardGrid, "delegate0");
447 compare(item0.enabled, true);
448- var touchdown = findChild(item0, "touchdown");
449-
450- compare(touchdown.visible, false);
451+
452+ touchdown = findChild(item0, "touchdown");
453+ compare(touchdown, null);
454+
455 mousePress(item0);
456+
457+ touchdown = findChild(item0, "touchdown");
458 compare(touchdown.visible, true);
459+
460 mouseRelease(item0);
461- compare(touchdown.visible, false);
462+
463+ touchdown = findChild(item0, "touchdown");
464+ compare(touchdown, null);
465 closePreview();
466 }
467

Subscribers

People subscribed via source and target branches