Merge into trunk : dash-forceNotExpandable : Code : Unity 8

Status:	Merged
Approved by:	Albert Astals Cid on 2016-11-18
Approved revision:	2697
Merged at revision:	2709
Proposed branch:	lp:~cimi/unity8/dash-forceNotExpandable
Merge into:	lp:unity8
Diff against target:	74 lines (+33/-1) 3 files modified qml/Dash/GenericScopeView.qml (+3/-1) tests/mocks/Unity/fake_categories.cpp (+4/-0) tests/qmltests/Dash/tst_GenericScopeView.qml (+26/-0)
To merge this branch:	bzr merge lp:~cimi/unity8/dash-forceNotExpandable
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration		Approve on 2016-11-24
Albert Astals Cid (community)		2016-11-17	Approve on 2016-11-18
Review via email: mp+311134@code.launchpad.net

Commit Message

Look up for expandable template dash category flag

Description of the Change

* Are there any related MPs required for this MP to build/function as expected? Please list.
no
* Did you perform an exploratory manual test run of your code change and any related functionality?
y
* 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?
y

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

#

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

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) wrote on 2016-11-18:

#

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

* Did CI run pass? If not, please explain why.
Unrelated launcher test

review: Approve

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

#

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

review: Needs Fixing (continuous-integration)

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

#

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

review: Approve (continuous-integration)

 === modified file 'qml/Dash/GenericScopeView.qml'
 --- qml/Dash/GenericScopeView.qml	2016-11-09 15:04:57 +0000
 +++ qml/Dash/GenericScopeView.qml	2016-11-17 11:59:26 +0000
@@ -243,8 +243,10 @@
              property Item seeAllButton: seeAll
++            readonly property bool forceNotExpandable: cardTool.template && cardTool.template["expandable"] === false
              readonly property bool expandable: {
                  if (categoryView.model.count === 1) return false;
++                if (forceNotExpandable) return false;
                  if (cardTool.template && cardTool.template["collapsed-rows"] === 0) return false;
                  if (item && item.expandedHeight > item.collapsedHeight) return true;
                  return false;
@@ -317,7 +319,7 @@
+                     }
+                 }
--                readonly property bool expanded: baseItem.expanded || !baseItem.expandable
++                readonly property bool expanded: !baseItem.forceNotExpandable && (baseItem.expanded || !baseItem.expandable)
                  height: expanded ? item.expandedHeight : item.collapsedHeight
                  source: {
 === modified file 'tests/mocks/Unity/fake_categories.cpp'
 --- tests/mocks/Unity/fake_categories.cpp	2016-03-07 17:12:34 +0000
 +++ tests/mocks/Unity/fake_categories.cpp	2016-11-17 11:59:26 +0000
@@ -69,6 +69,10 @@
              } else {
                  map["category-layout"] = "carousel";
+             }
++            if (index.row() == 16) {
++                map["expandable"] = false;
++                map["collapsed-rows"] = 1;
++            }
              if (index.row() == 18) {
                  map["category-layout"] = "horizontal-list";
+             }
 === modified file 'tests/qmltests/Dash/tst_GenericScopeView.qml'
 --- tests/qmltests/Dash/tst_GenericScopeView.qml	2016-11-09 15:02:03 +0000
 +++ tests/qmltests/Dash/tst_GenericScopeView.qml	2016-11-17 11:59:26 +0000
@@ -168,6 +168,32 @@
                  tryCompare(genericScopeView.scope, "searchQuery", "test")
+             }
++            function test_forceNotExpandable() {
++                // wait for the item to be there
++                tryCompareFunction(function() { return findChild(genericScopeView, "dashSectionHeader14", 0 /* timeout */) != null; }, true);
++
++                var category14 = findChild(genericScopeView, "dashCategory14")
++                var seeAll14 = findChild(category14, "seeAll")
++
++                compare(category14.forceNotExpandable, false);
++                waitForRendering(seeAll14);
++                verify(category14.expandable);
++                verify(!category14.expanded);
++                compare(seeAll14.visible, true);
++
++                // wait for the item to be there
++                tryCompareFunction(function() { return findChild(genericScopeView, "dashSectionHeader16", 0 /* timeout */) != null; }, true);
++
++                var category16 = findChild(genericScopeView, "dashCategory16")
++                var seeAll16 = findChild(category16, "seeAll")
++
++                compare(category16.forceNotExpandable, true);
++                waitForRendering(seeAll16);
++                verify(!category16.expandable);
++                verify(!category16.expanded);
++                compare(seeAll16.visible, false);
++            }
++
              function test_expand_collapse() {
                  tryCompareFunction(function() { return findChild(genericScopeView, "dashSectionHeader0", 0 /* timeout */) != null; }, true);

Unity 8

Merge lp:~cimi/unity8/dash-forceNotExpandable into lp:unity8

Commit Message

Description of the Change

Preview Diff

Subscribers