Unity 8

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

  1. broken_collapse
  2. Merge into trunk
Proposed by Albert Astals Cid
Status: Merged
Approved by: Albert Astals Cid
Approved revision: 580
Merged at revision: 579
Proposed branch: lp:~aacid/unity8/broken_collapse
Merge into: lp:unity8
Diff against target: 114 lines (+34/-3)
4 files modified
Components/FilterGrid.qml (+1/-1)
Dash/DashFilterGrid.qml (+6/-2)
Dash/GenericScopeView.qml (+2/-0)
tests/qmltests/Dash/tst_GenericScopeView.qml (+25/-0)
To merge this branch: bzr merge lp:~aacid/unity8/broken_collapse
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Michał Sawicz Approve
Robert Bruce Park (community) Needs Fixing
Review via email: mp+197844@code.launchpad.net

Commit message

Fix collapsing of categories not working and the expansion/collapsing animation

+test

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:574
http://jenkins.qa.ubuntu.com/job/unity8-ci/1827/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1447
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1415
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/570
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/350
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/351
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/351/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/350
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/1287
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1447
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1447/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1415
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1415/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3946
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/2097

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

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

PASSED: Continuous integration, rev:576
http://jenkins.qa.ubuntu.com/job/unity8-ci/1829/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1450
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1418
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/573
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/352
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/353
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/353/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/352
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/1290
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1450
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1450/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1418
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1418/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3949
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/2100

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

review: Approve (continuous-integration)
Revision history for this message
Michał Sawicz (saviq) wrote :

Yup, thanks!

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

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/835/
Executed test runs:
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/generic-cleanup-mbs/3545
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1460
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1424
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/577
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-autolanding/221
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/221
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/221/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-autolanding/221
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/1299
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1460
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1460/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1424
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1424/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3955
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/2107

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

PASSED: Continuous integration, rev:577
http://jenkins.qa.ubuntu.com/job/unity8-ci/1833/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1465
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1429
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/580
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/356
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/357
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/357/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/356
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/1304
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1465
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1465/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1429
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1429/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3960
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/2113

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

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

FAILED: Continuous integration, rev:578
http://jenkins.qa.ubuntu.com/job/unity8-ci/1835/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1472
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1434/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/583
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/358
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/359
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/359/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/358
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/1310
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1472
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1472/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1434
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1434/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3965/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/2119

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

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

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/840/
Executed test runs:
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/generic-cleanup-mbs/3552
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1483
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1445
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/586
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-autolanding/226
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/226
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/226/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-autolanding/226
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/1320
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1483
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1483/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1445
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1445/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3975
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/2130

review: Needs Fixing (continuous-integration)
Revision history for this message
Robert Bruce Park (robru) wrote :

Actually I just tried to merge this manually and found a conflict with trunk. Can you resolve it please?

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

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/842/
Executed test runs:
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/generic-cleanup-mbs/3554/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1489/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1451/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/590/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-autolanding/228/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/228/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-autolanding/228/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1489/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1451/console

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

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/843/
Executed test runs:
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/generic-cleanup-mbs/3555/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1491/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1453/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/591/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-autolanding/229/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/229/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-autolanding/229/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1491/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1453/console

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

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/844/
Executed test runs:
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/generic-cleanup-mbs/3557
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1493
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1455
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/592
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-autolanding/230
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/230
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/230/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-autolanding/230
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/1328
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1493
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1493/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1455
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1455/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3984
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/2140

review: Needs Fixing (continuous-integration)
Revision history for this message
Michał Sawicz (saviq) wrote :

Still yes.

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

FAILED: Continuous integration, rev:579
http://jenkins.qa.ubuntu.com/job/unity8-ci/1840/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1496
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1458/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/595
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/363
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/364
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/364/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/363
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/1331
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1496
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1496/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1458
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1458/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3987/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/2143

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

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

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/845/
Executed test runs:
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/generic-cleanup-mbs/3558
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1498
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1460
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/597
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-autolanding/231
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/231
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/231/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-autolanding/231
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/1333
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1498
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1498/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1460
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1460/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3989
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/2145

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

FAILED: Continuous integration, rev:580
http://jenkins.qa.ubuntu.com/job/unity8-ci/1842/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1499
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1461/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/598
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/365
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/366
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/366/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/365
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/1334
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1499
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1499/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1461
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1461/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3991/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/2147

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

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Components/FilterGrid.qml'
2--- Components/FilterGrid.qml 2013-11-26 16:32:47 +0000
3+++ Components/FilterGrid.qml 2013-12-06 10:37:16 +0000
4@@ -67,7 +67,7 @@
5 property alias highlightIndex: iconTileGrid.highlightIndex
6 readonly property alias currentItem: iconTileGrid.currentItem
7
8- implicitHeight: !filterAnimation.running ? childrenRect.height : height
9+ height: !filterAnimation.running ? childrenRect.height : height
10 clip: filterAnimation.running
11
12 NumberAnimation {
13
14=== modified file 'Dash/DashFilterGrid.qml'
15--- Dash/DashFilterGrid.qml 2013-11-26 16:32:47 +0000
16+++ Dash/DashFilterGrid.qml 2013-12-06 10:37:16 +0000
17@@ -37,7 +37,7 @@
18 expandable: filterGrid.expandable
19 delegateCreationBegin: filterGrid.delegateCreationBegin
20 delegateCreationEnd: filterGrid.delegateCreationEnd
21- implicitHeight: filterGrid.implicitHeight
22+ height: filterGrid.height
23 margins: filterGrid.margins
24 uncollapsedHeight: filterGrid.uncollapsedHeight
25 verticalSpacing: filterGrid.verticalSpacing
26@@ -48,7 +48,7 @@
27
28 FilterGrid {
29 id: filterGrid
30- anchors.fill: parent
31+ width: dashFilterGrid.width
32 minimumHorizontalSpacing: units.gu(0.5)
33 delegateWidth: units.gu(11)
34 delegateHeight: units.gu(9.5)
35@@ -56,5 +56,9 @@
36 model: dashFilterGrid.model
37 filter: dashFilterGrid.filter
38 highlightIndex: dashFilterGrid.highlightIndex
39+
40+ onFilterChanged: {
41+ dashFilterGrid.filter = filter
42+ }
43 }
44 }
45
46=== modified file 'Dash/GenericScopeView.qml'
47--- Dash/GenericScopeView.qml 2013-11-30 14:24:29 +0000
48+++ Dash/GenericScopeView.qml 2013-12-06 10:37:16 +0000
49@@ -126,6 +126,7 @@
50
51 delegate: ListItems.Base {
52 id: baseItem
53+ objectName: "dashCategory" + category
54 highlightWhenPressed: false
55
56 readonly property bool expandable: rendererLoader.item ? rendererLoader.item.expandable : false
57@@ -271,6 +272,7 @@
58
59 sectionProperty: "name"
60 sectionDelegate: ListItems.Header {
61+ objectName: "dashSectionHeader" + delegate.category
62 property var delegate: categoryView.item(delegateIndex)
63 width: categoryView.width
64 text: section
65
66=== modified file 'tests/qmltests/Dash/tst_GenericScopeView.qml'
67--- tests/qmltests/Dash/tst_GenericScopeView.qml 2013-12-05 18:01:29 +0000
68+++ tests/qmltests/Dash/tst_GenericScopeView.qml 2013-12-06 10:37:16 +0000
69@@ -19,6 +19,7 @@
70 import Unity 0.1
71 import ".."
72 import "../../../Dash"
73+import "../../../Components"
74 import Ubuntu.Components 0.1
75 import Unity.Test 0.1 as UT
76
77@@ -43,6 +44,7 @@
78 GenericScopeView {
79 id: genericScopeView
80 anchors.fill: parent
81+ searchHistory: SearchHistoryModel {}
82
83 UT.UnityTestCase {
84 name: "GenericScopeView"
85@@ -223,6 +225,29 @@
86 tryCompare(genericScopeView.scope, "searchQuery", "")
87 }
88
89+ function test_filter_expand_collapse() {
90+ // wait for the item to be there
91+ tryCompareFunction(function() { return findChild(genericScopeView, "dashSectionHeader0") != undefined; }, true);
92+
93+ var header = findChild(genericScopeView, "dashSectionHeader0")
94+ var category = findChild(genericScopeView, "dashCategory0")
95+
96+ waitForRendering(header);
97+ verify(category.expandable);
98+ verify(category.filtered);
99+
100+ var initialHeight = category.height;
101+ var middleHeight;
102+ mouseClick(header, header.width / 2, header.height / 2);
103+ tryCompareFunction(function() { middleHeight = category.height; return category.height > initialHeight; }, true);
104+ tryCompare(category, "filtered", false);
105+ verify(category.height > middleHeight);
106+
107+ mouseClick(header, header.width / 2, header.height / 2);
108+ verify(category.expandable);
109+ tryCompare(category, "filtered", true);
110+ }
111+
112 function test_showPreviewCarousel() {
113 tryCompareFunction(function() { return findChild(genericScopeView, "carouselDelegate") != undefined; }, true);
114 var tile = findChild(genericScopeView, "carouselDelegate");

Subscribers

People subscribed via source and target branches