Unity 8

Merge lp:~unity-team/unity8/two_see_more_bugfix into lp:unity8

two_see_more_bugfix
Merge into trunk

Proposed by Michał Sawicz on 2014-09-11

Status:

Merged

Approved by:

Andrea Cimitan on 2014-09-18

Approved revision:

1193

Merged at revision:

1272

Proposed branch:

lp:~unity-team/unity8/two_see_more_bugfix

Merge into:

lp:unity8

Diff against target:

738 lines (+322/-184)

10 files modified

plugins/Dash/listviewwithpageheader.cpp (+11/-1)
plugins/Dash/listviewwithpageheader.h (+2/-0)
qml/Dash/GenericScopeView.qml (+74/-29)
tests/mocks/Unity/fake_categories.cpp (+100/-141)
tests/mocks/Unity/fake_categories.h (+7/-12)
tests/mocks/Unity/fake_resultsmodel.cpp (+9/-0)
tests/mocks/Unity/fake_resultsmodel.h (+3/-0)
tests/mocks/Unity/fake_scope.cpp (+17/-0)
tests/mocks/Unity/fake_scope.h (+2/-0)
tests/qmltests/Dash/tst_GenericScopeView.qml (+97/-1)

To merge this branch:

bzr merge lp:~unity-team/unity8/two_see_more_bugfix

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration	2014-09-11	Needs Fixing on 2014-09-18
Andrea Cimitan (community)			Approve on 2014-09-18
Albert Astals Cid (community)	contains my code		Abstain on 2014-09-15
Michael Zanetti (community)		2014-09-11	Needs Fixing on 2014-09-12
Review via email: mp+234340@code.launchpad.net

This proposal supersedes a proposal from 2014-08-19.

Commit message

Dash: Fix issue when expanding a category and collapsing another one at the same time.

We need to first run the shrink+grow animations in the two category items, and later, if needed run the maximizeVisibleArea in the one we expanded.

It does not fix *everything* related to seeAll growing/shrinking + maximization, it may need some rethinking/rearchitecture to fix all issues, so let's just get these in that fix some very broken behaviour

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

* Did you make sure that your branch does not contain spurious tags?
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

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-20: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-27: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:1182
http://jenkins.qa.ubuntu.com/job/unity8-ci/4129/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4106/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1130
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1223/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1223/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5358/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-27: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-27: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-28: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-28: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-29: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-11:

FAILED: Continuous integration, rev:1187
http://jenkins.qa.ubuntu.com/job/unity8-ci/4285/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4744/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1286
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1379
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1379
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4513/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5996
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5996/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13084

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2014-09-12:

Some minor things inline, seems to work fine.

review: Needs Fixing

Revision history for this message

Michał Sawicz (saviq) wrote on 2014-09-12:

Fixeded.

lp:~unity-team/unity8/two_see_more_bugfix updated on 2014-09-12

1188. By Michał Sawicz on 2014-09-12: Drop Q_PROPERTY
1189. By Michał Sawicz on 2014-09-12: We already have a seeAllButton property.
1190. By Michał Sawicz on 2014-09-12: I said we have it already.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-12:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2014-09-12:

seems to fail a test now :/

review: Needs Fixing

Revision history for this message

Michał Sawicz (saviq) wrote on 2014-09-12:

> seems to fail a test now :/

Yeah, and I can't reproduce locally. Albert, back to you...

Revision history for this message

Albert Astals Cid (aacid) on 2014-09-15:

review: Abstain (contains my code)

lp:~unity-team/unity8/two_see_more_bugfix updated on 2014-09-15

1191. By Albert Astals Cid on 2014-09-15

Try to make LVWPH to behave consistently

doubles are not fun

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-15:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-09-16:

The crash in testDashContent is fixed by https://bugs.launchpad.net/ubuntu/+source/qtdeclarative-opensource-src/+bug/1369930

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-17:

FAILED: Continuous integration, rev:1191
http://jenkins.qa.ubuntu.com/job/unity8-ci/4335/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4901/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1336
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1429
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1429
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4654/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6153
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6153/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13323

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Andrea Cimitan (cimi) wrote on 2014-09-18:

Minor things around spacing

A question more for the backend: is it possible to have same categoryId? (in case someone badly implements a scope) We are checking for the id string now, rather the obj

lp:~unity-team/unity8/two_see_more_bugfix updated on 2014-09-18

1192. By Albert Astals Cid on 2014-09-18: spacing and (C) year

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-09-18:

> A question more for the backend: is it possible to have same categoryId? (in
> case someone badly implements a scope) We are checking for the id string now,
> rather the obj

Yes, we used to check for id not too long ago, but was [wrongly] changed in r1212 http://bazaar.launchpad.net/~unity-team/unity8/trunk/revision/1212

I say wrognly changed because keeping the pointer to the delegate means that if you scroll a lot in the list and the delegate gets destroyed, when you come back it'll be a different delegate pointer.

lp:~unity-team/unity8/two_see_more_bugfix updated on 2014-09-18

1193. By Albert Astals Cid on 2014-09-18: Typo

Revision history for this message

Andrea Cimitan (cimi) wrote on 2014-09-18:

* Did you perform an exploratory manual test run of the code change and any related functionality?
Tested this branch through other dependants, works fine
* Did CI run pass? If not, please explain why.
Auto.. ehm. :)

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-18:

FAILED: Continuous integration, rev:1192
http://jenkins.qa.ubuntu.com/job/unity8-ci/4342/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4932/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1343
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1436
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1436
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4684/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6184
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6184/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13368

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

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Mohammad Rakibul Hasan

Unity Team

 === modified file 'plugins/Dash/listviewwithpageheader.cpp'
 --- plugins/Dash/listviewwithpageheader.cpp	2014-09-01 10:45:25 +0000
 +++ plugins/Dash/listviewwithpageheader.cpp	2014-09-18 10:05:43 +0000
@@ -409,6 +409,16 @@
+     }
+ }
++int ListViewWithPageHeader::firstCreatedIndex() const
++{
++    return m_firstVisibleIndex;
++}
++
++int ListViewWithPageHeader::createdItemCount() const
++{
++    return m_visibleItems.count();
++}
++
  QQuickItem *ListViewWithPageHeader::item(int modelIndex) const
+ {
      ListItem *item = itemAtIndex(modelIndex);
@@ -520,7 +530,7 @@
              // (but the header was not shown by it's own position)
              // or the header is partially shown and we are not doing a maximizeVisibleArea either
              const bool scrolledUp = m_previousContentY > contentY();
--            const bool notRebounding = contentY() + height() < contentHeight();
++            const bool notRebounding = qRound(contentY() + height()) < qRound(contentHeight());
              const bool notShownByItsOwn = contentY() + diff >= m_headerItem->y() + m_headerItem->height();
              const bool maximizeVisibleAreaRunning = m_contentYAnimation->isRunning() && contentYAnimationType == ContentYAnimationMaximizeVisibleArea;
 === modified file 'plugins/Dash/listviewwithpageheader.h'
 --- plugins/Dash/listviewwithpageheader.h	2014-09-01 10:45:25 +0000
 +++ plugins/Dash/listviewwithpageheader.h	2014-09-18 10:05:43 +0000
@@ -86,6 +86,8 @@
      Q_INVOKABLE void positionAtBeginning();
      Q_INVOKABLE void showHeader();
++    Q_INVOKABLE int firstCreatedIndex() const;
++    Q_INVOKABLE int createdItemCount() const;
      Q_INVOKABLE QQuickItem *item(int modelIndex) const;
      // The index has to be created for this to try to do something
 === modified file 'qml/Dash/GenericScopeView.qml'
 --- qml/Dash/GenericScopeView.qml	2014-09-08 14:15:01 +0000
 +++ qml/Dash/GenericScopeView.qml	2014-09-18 10:05:43 +0000
@@ -47,6 +47,10 @@
      signal backClicked()
++    onScopeChanged: {
++        floatingSeeLess.companionBase = null;
++    }
++
      function positionAtBeginning() {
          categoryView.positionAtBeginning()
+     }
@@ -152,11 +156,54 @@
          forceNoClip: subPageLoader.open
          pixelAligned: true
--        property Item expandedCategoryItem: null
++        property string expandedCategoryId: ""
++        property int runMaximizeAfterSizeChanges: 0
          readonly property bool pageHeaderTotallyVisible: scopeView.showPageHeader &&
              ((headerItemShownHeight == 0 && categoryView.contentY <= categoryView.originY) || (headerItemShownHeight == pageHeaderLoader.item.height))
++        onExpandedCategoryIdChanged: {
++            var firstCreated = firstCreatedIndex();
++            var shrinkingAny = false;
++            var shrinkHeightDifference = 0;
++            for (var i = 0; i < createdItemCount(); ++i) {
++                var baseItem = item(firstCreated + i);
++                if (baseItem.expandable) {
++                    var shouldExpand = baseItem.category === expandedCategoryId;
++                    if (shouldExpand != baseItem.expanded) {
++                        var animate = false;
++                        if (!subPageLoader.open) {
++                            var animateShrinking = !shouldExpand && baseItem.y + baseItem.item.collapsedHeight + baseItem.seeAllButton.height < categoryView.height;
++                            var animateGrowing = shouldExpand && baseItem.y + baseItem.height < categoryView.height;
++                            animate = shrinkingAny || animateShrinking || animateGrowing;
++                        }
++
++                        if (!shouldExpand) {
++                            shrinkingAny = true;
++                            shrinkHeightDifference = baseItem.item.expandedHeight - baseItem.item.collapsedHeight;
++                        }
++
++                        if (shouldExpand && !subPageLoader.open) {
++                            if (!shrinkingAny) {
++                                categoryView.maximizeVisibleArea(firstCreated + i, baseItem.item.expandedHeight + baseItem.seeAllButton.height);
++                            } else {
++                                // If the space that shrinking is smaller than the one we need to grow we'll call maximizeVisibleArea
++                                // after the shrink/grow animation ends
++                                var growHeightDifference = baseItem.item.expandedHeight - baseItem.item.collapsedHeight;
++                                if (growHeightDifference > shrinkHeightDifference) {
++                                    runMaximizeAfterSizeChanges = 2;
++                                } else {
++                                    runMaximizeAfterSizeChanges = 0;
++                                }
++                            }
++                        }
++
++                        baseItem.expand(shouldExpand, animate);
++                    }
++                }
++            }
++        }
++
          delegate: ListItems.Base {
              id: baseItem
              objectName: "dashCategory" + category
@@ -194,7 +241,7 @@
                  // This can happen with the VJ that doesn't know how height it will be on creation
                  // so doesn't set expandable until a bit too late for onLoaded
                  if (expandable) {
--                    var shouldExpand = baseItem === categoryView.expandedCategoryItem;
++                    var shouldExpand = baseItem.category === categoryView.expandedCategoryId;
                      baseItem.expand(shouldExpand, false /*animate*/);
+                 }
+             }
@@ -215,9 +262,23 @@
                      id: heightBehaviour
                      enabled: false
                      animation: UbuntuNumberAnimation {
++                        duration: UbuntuAnimation.FastDuration
                          onRunningChanged: {
                              if (!running) {
                                  heightBehaviour.enabled = false
++                                if (categoryView.runMaximizeAfterSizeChanges > 0) {
++                                    categoryView.runMaximizeAfterSizeChanges--;
++                                    if (categoryView.runMaximizeAfterSizeChanges == 0) {
++                                        var firstCreated = categoryView.firstCreatedIndex();
++                                        for (var i = 0; i < categoryView.createdItemCount(); ++i) {
++                                            var baseItem = categoryView.item(firstCreated + i);
++                                            if (baseItem.category === categoryView.expandedCategoryId) {
++                                                categoryView.maximizeVisibleArea(firstCreated + i, baseItem.item.expandedHeight + baseItem.seeAllButton.height);
++                                                break;
++                                            }
++                                        }
++                                    }
++                                }
+                             }
+                         }
+                     }
@@ -245,7 +306,7 @@
                      item.objectName = Qt.binding(function() { return categoryId })
                      item.scopeStyle = scopeView.scopeStyle;
                      if (baseItem.expandable) {
--                        var shouldExpand = baseItem === categoryView.expandedCategoryItem;
++                        var shouldExpand = baseItem.category === categoryView.expandedCategoryId;
                          baseItem.expand(shouldExpand, false /*animate*/);
+                     }
                      updateDelegateCreationRange();
@@ -282,27 +343,6 @@
+                 }
                  Connections {
                      target: categoryView
--                    onExpandedCategoryItemChanged: {
--                        collapseAllButExpandedCategory();
--                    }
--                    function collapseAllButExpandedCategory() {
--                        var item = rendererLoader.item;
--                        if (baseItem.expandable) {
--                            var shouldExpand = baseItem === categoryView.expandedCategoryItem;
--                            if (shouldExpand != baseItem.expanded) {
--                                // If the filter animation will be seen start it, otherwise, just flip the switch
--                                var shrinkingVisible = !shouldExpand && y + item.collapsedHeight + seeAll.height < categoryView.height;
--                                var growingVisible = shouldExpand && y + height < categoryView.height;
--                                if (!subPageLoader.open || shouldExpand) {
--                                    var animate = shrinkingVisible || growingVisible;
--                                    baseItem.expand(shouldExpand, animate)
--                                    if (shouldExpand && !subPageLoader.open) {
--                                        categoryView.maximizeVisibleArea(index, item.expandedHeight + seeAll.height);
--                                    }
--                                }
--                            }
--                        }
--                    }
                      onOriginYChanged: rendererLoader.updateDelegateCreationRange();
                      onContentYChanged: rendererLoader.updateDelegateCreationRange();
                      onHeightChanged: rendererLoader.updateDelegateCreationRange();
@@ -352,10 +392,11 @@
                  height: seeAllLabel.visible ? seeAllLabel.font.pixelSize + units.gu(4) : 0
                  onClicked: {
--                    if (categoryView.expandedCategoryItem !== baseItem) {
--                        categoryView.expandedCategoryItem = baseItem;
++                    if (categoryView.expandedCategoryId !== baseItem.category) {
++                        categoryView.expandedCategoryId = baseItem.category;
++                        floatingSeeLess.companionBase = baseItem;
                      } else {
--                        categoryView.expandedCategoryItem = null;
++                        categoryView.expandedCategoryId = "";
+                     }
+                 }
@@ -455,7 +496,7 @@
          objectName: "floatingSeeLess"
          property Item companionTo: companionBase ? companionBase.seeAllButton : null
--        property Item companionBase: categoryView.expandedCategoryItem
++        property Item companionBase: null
          property bool showBecausePosition: false
          property real yOffset: 0
@@ -467,7 +508,7 @@
          height: seeLessLabel.font.pixelSize + units.gu(4)
          visible: companionTo && showBecausePosition
--        onClicked: categoryView.expandedCategoryItem = null;
++        onClicked: categoryView.expandedCategoryId = "";
          function updateVisibility() {
              var companionPos = companionTo.mapToItem(floatingSeeLess, 0, 0);
@@ -476,6 +517,10 @@
              var posToBase = floatingSeeLess.mapToItem(companionBase, 0, -yOffset).y;
              yOffset = Math.max(0, companionBase.item.collapsedHeight - posToBase);
              yOffset = Math.min(yOffset, height);
++
++            if (!showBecausePosition && categoryView.expandedCategoryId === "") {
++                companionBase = null;
++            }
+         }
          Label {
 === modified file 'tests/mocks/Unity/fake_categories.cpp'
 --- tests/mocks/Unity/fake_categories.cpp	2014-08-15 14:21:42 +0000
 +++ tests/mocks/Unity/fake_categories.cpp	2014-09-18 10:05:43 +0000
@@ -29,25 +29,12 @@
  int Categories::rowCount(const QModelIndex& /*parent*/) const
+ {
--    return m_category_count + m_specialCategories.count();
++    return m_category_count;
+ }
--void Categories::addSpecialCategory(QString const& categoryId, QString const& name, QString const& icon, QString const& rawTemplate, QObject* countObject)
++void Categories::addSpecialCategory(QString const& /*categoryId*/, QString const& /*name*/, QString const& /*icon*/, QString const& /*rawTemplate*/, QObject* /*countObject*/)
+ {
--    CategoryData catData;
--    catData.categoryId = categoryId;
--    catData.name = name;
--    catData.icon = icon;
--    catData.rawTemplate = rawTemplate;
--    catData.countObject = countObject;
--
--    beginInsertRows(QModelIndex(), 0, 0);
--    m_specialCategories.prepend(catData);
--    endInsertRows();
--
--    if (countObject) {
--        connect(countObject, SIGNAL(countChanged()), this, SLOT(countChanged()));
--    }
++    qFatal("Using un-implemented Categories::addSpecialCategory");
+ }
  bool Categories::overrideCategoryJson(QString const& /* categoryId */, QString const& /* json */)
@@ -55,23 +42,6 @@
      qFatal("Using un-implemented Categories::overrideCategoryJson");
+ }
--void Categories::countChanged()
--{
--    QObject* countObject = sender();
--
--    for (int i = 0; i < m_specialCategories.count(); ++i) {
--        const CategoryData &catData = m_specialCategories.at(i);
--        if (catData.countObject == countObject) {
--            QVector<int> roles;
--            roles.append(RoleCount);
--
--            QModelIndex changedIndex(index(i));
--            dataChanged(changedIndex, changedIndex, roles);
--            break;
--        }
--    }
--}
--
  QVariant
  Categories::data(const QModelIndex& index, int role) const
+ {
@@ -79,115 +49,74 @@
          return QVariant();
+     }
--    ResultsModel *resultsModel = m_resultsModels[index.row()];
--    if (!resultsModel) {
--        resultsModel = new ResultsModel(15, index.row());
--        m_resultsModels[index.row()] = resultsModel;
--    }
--    if (index.row() < m_specialCategories.count()) {
--        const CategoryData &catData = m_specialCategories.at(index.row());
--        switch (role) {
--            case RoleCategoryId:
--                return catData.categoryId;
--            case RoleName:
--                return catData.name;
--            case RoleIcon:
--                return catData.icon;
--            case RoleRawRendererTemplate:
--                return catData.rawTemplate;
--            case RoleRenderer:
--            {
--                QVariantMap map;
--                if (index.row() % 2 == 0) {
--                    map["category-layout"] = "grid";
--                } else {
--                    map["category-layout"] = "carousel";
--                    map["overlay"] = true;
--                }
--                map["card-size"] = "small";
--                return map;
--            }
--            case RoleComponents:
--            {
--                QVariantMap map, artMap, attributeMap;
++    ResultsModel *resultsModel = resultModel(index.row());
++    switch (role) {
++        case RoleCategoryId:
++            return QString("%1").arg(index.row());
++        case RoleName:
++            return QString("Category %1").arg(index.row());
++        case RoleIcon:
++            return "gtk-apply";
++        case RoleRawRendererTemplate:
++            qFatal("Using un-implemented RoleRawRendererTemplate Categories role");
++            return QVariant();
++        case RoleRenderer:
++        {
++            QVariantMap map;
++            if (index.row() % 2 == 0) {
++                map["category-layout"] = "grid";
++            } else {
++                map["category-layout"] = "carousel";
++            }
++            if (index.row() == 18) {
++                map["category-layout"] = "horizontal-list";
++            }
++            if (index.row() == 19) {
++                map["category-layout"] = "grid";
++                map["collapsed-rows"] = 0;
++            }
++            map["card-size"] = "small";
++
++            map["category-layout"] = m_layouts.value(index.row(), map["category-layout"].toString());
++
++            if (map["category-layout"] == "carousel") {
++                map["overlay"] = true;
++            }
++
++            return map;
++        }
++        case RoleComponents:
++        {
++            QVariantMap map, artMap, attributeMap;
++            if (index.row() % 2 != 0) {
++                artMap["aspect-ratio"] = QString("1.%1").arg(index.row());
++            } else {
                  artMap["aspect-ratio"] = "1.0";
--                artMap["field"] = "art";
--                map["art"] = artMap;
--                map["title"] = "HOLA";
--                attributeMap["field"] = "attribute";
--                map["attributes"] = attributeMap;
--                return map;
--            }
--            case RoleHeaderLink:
--                return QString();
--            case RoleResults:
--                return QVariant();
--            case RoleCount:
--                return catData.countObject->property("count");
--            default:
--                qFatal("Using un-implemented Categories role");
--                return QVariant();
--        }
--    } else {
--        switch (role) {
--            case RoleCategoryId:
--                return QString("%1").arg(index.row());
--            case RoleName:
--                return QString("Category %1").arg(index.row());
--            case RoleIcon:
--                return "gtk-apply";
--            case RoleRawRendererTemplate:
--                qFatal("Using un-implemented RoleRawRendererTemplate Categories role");
--                return QVariant();
--            case RoleRenderer:
--            {
--                QVariantMap map;
--                if (index.row() % 2 == 0) {
--                    map["category-layout"] = "grid";
--                } else {
--                    map["category-layout"] = "carousel";
--                    map["card-size"] = "medium";
--                    map["overlay"] = true;
--                }
--                if (index.row() == 18) {
--                    map["category-layout"] = "horizontal-list";
--                }
--                if (index.row() == 19) {
--                    map["category-layout"] = "grid";
--                    map["collapsed-rows"] = 0;
--                }
--                map["card-size"] = "small";
--                return map;
--            }
--            case RoleComponents:
--            {
--                QVariantMap map, artMap, attributeMap;
--                if (index.row() % 2 != 0) {
--                    artMap["aspect-ratio"] = QString("1.%1").arg(index.row());
--                } else {
--                    artMap["aspect-ratio"] = "1.0";
--                }
--                artMap["field"] = "art";
--                map["art"] = artMap;
--                map["title"] = "HOLA";
--                map["subtitle"] = "HOLA";
--                attributeMap["field"] = "attribute";
--                map["attributes"] = attributeMap;
--                return map;
--            }
--            case RoleHeaderLink:
--                if (index.row() == 1 || index.row() == 4) {
--                    return QString("scope://query/1");
--                }
--                return QString();
--            case RoleResults:
--                return QVariant::fromValue(resultsModel);
--            case RoleCount:
--                return resultsModel->rowCount();
--            default:
--                qFatal("Using un-implemented Categories role");
--                return QVariant();
--        }
++            }
++            artMap["field"] = "art";
++            map["art"] = artMap;
++            map["title"] = "HOLA";
++            map["subtitle"] = "HOLA";
++            attributeMap["field"] = "attribute";
++            map["attributes"] = attributeMap;
++            return map;
++        }
++        case RoleHeaderLink:
++        {
++            QString res;
++            if (index.row() == 1 || index.row() == 4) {
++                res = QString("scope://query/1");
++            }
++            res = m_headerLinks.value(index.row(), res);
++            return res;
++        }
++        case RoleResults:
++            return QVariant::fromValue(resultsModel);
++        case RoleCount:
++            return resultsModel->rowCount();
++        default:
++            qFatal("Using un-implemented Categories role");
++            return QVariant();
+     }
+ }
@@ -196,3 +125,33 @@
+ {
      return data(index(row, 0), role);
+ }
++
++void Categories::setCount(int count)
++{
++    if (m_category_count != count) {
++        beginResetModel(); // This is just for test setup so we can be lazy and reset
++        m_category_count = count;
++        endResetModel();
++    }
++}
++
++ResultsModel* Categories::resultModel(int row) const
++{
++    ResultsModel *result = m_resultsModels[row];
++    if (!result) {
++        Categories *that = const_cast<Categories*>(this);
++        result = new ResultsModel(15, row, that);
++        m_resultsModels[row] = result;
++    }
++    return result;
++}
++
++void Categories::setLayout(int row, const QString &layout)
++{
++    m_layouts[row] = layout;
++}
++
++void Categories::setHeaderLink(int row, const QString &headerLink)
++{
++    m_headerLinks[row] = headerLink;
++}
 === modified file 'tests/mocks/Unity/fake_categories.h'
 --- tests/mocks/Unity/fake_categories.h	2014-07-11 16:39:33 +0000
 +++ tests/mocks/Unity/fake_categories.h	2014-09-18 10:05:43 +0000
@@ -39,22 +39,17 @@
      Q_INVOKABLE QVariant data(int row, int role) const;
--private Q_SLOTS:
--    void countChanged();
++    // For testing purposes
++    Q_INVOKABLE void setCount(int count);
++    Q_INVOKABLE ResultsModel* resultModel(int row) const;
++    Q_INVOKABLE void setLayout(int row, const QString &layout);
++    Q_INVOKABLE void setHeaderLink(int row, const QString &headerLink);
  private:
      mutable QHash<int, ResultsModel*> m_resultsModels;
++    QHash<int, QString> m_layouts;
++    QHash<int, QString> m_headerLinks;
      int m_category_count;
--
--    struct CategoryData {
--        QString categoryId;
--        QString name;
--        QString icon;
--        QString rawTemplate;
--        QObject* countObject;
--    };
--
--    QList<CategoryData> m_specialCategories;
  };
  #endif // FAKE_CATEGORIES_H
 === modified file 'tests/mocks/Unity/fake_resultsmodel.cpp'
 --- tests/mocks/Unity/fake_resultsmodel.cpp	2014-08-13 16:06:40 +0000
 +++ tests/mocks/Unity/fake_resultsmodel.cpp	2014-09-18 10:05:43 +0000
@@ -44,6 +44,15 @@
      qFatal("Calling un-implemented ResultsModel::setCategoryId");
+ }
++void ResultsModel::setResultCount(int result_count)
++{
++    if (m_result_count != result_count) {
++        beginResetModel(); // This is just for test setup so we can be lazy and reset
++        m_result_count = result_count;
++        endResetModel();
++    }
++}
++
  int ResultsModel::rowCount(const QModelIndex& parent) const
+ {
      Q_UNUSED(parent);
 === modified file 'tests/mocks/Unity/fake_resultsmodel.h'
 --- tests/mocks/Unity/fake_resultsmodel.h	2014-08-11 09:57:29 +0000
 +++ tests/mocks/Unity/fake_resultsmodel.h	2014-09-18 10:05:43 +0000
@@ -41,6 +41,9 @@
      /* setters */
      void setCategoryId(QString const& id) override;
++    // For testing purposes
++    Q_INVOKABLE void setResultCount(int result_count);
++
  private:
      int m_result_count;
      int m_categoryId;
 === modified file 'tests/mocks/Unity/fake_scope.cpp'
 --- tests/mocks/Unity/fake_scope.cpp	2014-08-27 08:01:40 +0000
 +++ tests/mocks/Unity/fake_scope.cpp	2014-09-18 10:05:43 +0000
@@ -145,6 +145,23 @@
          Q_EMIT favoriteChanged();
+     }
+ }
++
++void Scope::setId(const QString &id)
++{
++    if (id != m_id) {
++        m_id = id;
++        Q_EMIT idChanged();
++    }
++}
++
++void Scope::setName(const QString &name)
++{
++    if (name != m_name) {
++        m_name = name;
++        Q_EMIT nameChanged();
++    }
++}
++
  void Scope::setSearchInProgress(const bool inProg)
+ {
      if (inProg != m_searching) {
 === modified file 'tests/mocks/Unity/fake_scope.h'
 --- tests/mocks/Unity/fake_scope.h	2014-08-12 12:09:49 +0000
 +++ tests/mocks/Unity/fake_scope.h	2014-09-18 10:05:43 +0000
@@ -56,6 +56,8 @@
      void setFormFactor(const QString& form_factor) override;
      void setActive(const bool) override;
      void setFavorite(const bool) override;
++    Q_INVOKABLE void setId(const QString &id); // This is not invokable in the Interface, here for testing benefits
++    Q_INVOKABLE void setName(const QString &name); // This is not invokable in the Interface, here for testing benefits
      Q_INVOKABLE void setSearchInProgress(const bool inProg); // This is not invokable in the Interface, here for testing benefits
      Q_INVOKABLE void activate(QVariant const& result) override;
 === modified file 'tests/qmltests/Dash/tst_GenericScopeView.qml'
 --- tests/qmltests/Dash/tst_GenericScopeView.qml	2014-08-26 19:25:41 +0000
 +++ tests/qmltests/Dash/tst_GenericScopeView.qml	2014-09-18 10:05:43 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright 2013 Canonical Ltd.
++ * Copyright 2014 Canonical Ltd.
+  *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
@@ -43,6 +43,10 @@
          onLoadedChanged: if (loaded) genericScopeView.scope = scopes.getScope(2);
+     }
++    MockScope {
++        id: mockScope
++    }
++
      SignalSpy {
          id: spy
+     }
@@ -92,6 +96,17 @@
                  return findChild(genericScopeView, category);
+             }
++            function scrollToEnd()
++            {
++                var categoryListView = findChild(genericScopeView, "categoryListView");
++                waitForRendering(categoryListView);
++                while (!categoryListView.atYEnd) {
++                    mouseFlick(genericScopeView, genericScopeView.width/2, genericScopeView.height - units.gu(8),
++                               genericScopeView.width/2, genericScopeView.y)
++                    tryCompare(categoryListView, "moving", false);
++                }
++            }
++
              function test_isActive() {
                  tryCompare(genericScopeView.scope, "isActive", false)
                  genericScopeView.isCurrent = true
@@ -426,6 +441,87 @@
                  compare(image.source, data.logo, "Title image has the wrong source");
+             }
++            function test_seeAllTwoCategoriesScenario1() {
++                mockScope.setId("mockScope");
++                mockScope.setName("Mock Scope");
++                mockScope.categories.setCount(2);
++                mockScope.categories.resultModel(0).setResultCount(50);
++                mockScope.categories.resultModel(1).setResultCount(15);
++                mockScope.categories.setLayout(0, "grid");
++                mockScope.categories.setLayout(1, "grid");
++                mockScope.categories.setHeaderLink(0, "");
++                mockScope.categories.setHeaderLink(1, "");
++                genericScopeView.scope = mockScope;
++                waitForRendering(genericScopeView.categoryView);
++
++                var category0 = findChild(genericScopeView, "dashCategory0")
++                var seeAll0 = findChild(category0, "seeAll")
++
++                waitForRendering(seeAll0);
++                verify(category0.expandable);
++                verify(!category0.expanded);
++
++                mouseClick(seeAll0, seeAll0.width / 2, seeAll0.height / 2);
++                verify(category0.expanded);
++                tryCompare(category0, "height", category0.item.expandedHeight + seeAll0.height);
++                tryCompare(genericScopeView.categoryView, "contentY", units.gu(13.5));
++
++                scrollToEnd();
++
++                tryCompareFunction(function() { return findChild(genericScopeView, "dashCategory1") !== null; }, true);
++                var category1 = findChild(genericScopeView, "dashCategory1")
++                var seeAll1 = findChild(category1, "seeAll")
++                verify(category1.expandable);
++                verify(!category1.expanded);
++
++                mouseClick(seeAll1, seeAll1.width / 2, seeAll1.height / 2);
++                verify(!category0.expanded);
++                verify(category1.expanded);
++                tryCompare(category1, "height", category1.item.expandedHeight + seeAll1.height);
++                tryCompareFunction(function() {
++                    return genericScopeView.categoryView.contentY + category1.y + category1.height
++                           == genericScopeView.categoryView.contentHeight;}
++                    , true);
++            }
++
++            function test_seeAllTwoCategoriesScenario2() {
++                mockScope.setId("mockScope");
++                mockScope.setName("Mock Scope");
++                mockScope.categories.setCount(2);
++                mockScope.categories.resultModel(0).setResultCount(15);
++                mockScope.categories.resultModel(1).setResultCount(50);
++                mockScope.categories.setLayout(0, "grid");
++                mockScope.categories.setLayout(1, "grid");
++                mockScope.categories.setHeaderLink(0, "");
++                mockScope.categories.setHeaderLink(1, "");
++                genericScopeView.scope = mockScope;
++                waitForRendering(genericScopeView.categoryView);
++
++                var category0 = findChild(genericScopeView, "dashCategory0")
++                var seeAll0 = findChild(category0, "seeAll")
++
++                waitForRendering(seeAll0);
++                verify(category0.expandable);
++                verify(!category0.expanded);
++
++                mouseClick(seeAll0, seeAll0.width / 2, seeAll0.height / 2);
++                verify(category0.expanded);
++                tryCompare(category0, "height", category0.item.expandedHeight + seeAll0.height);
++
++                scrollToEnd();
++
++                var category1 = findChild(genericScopeView, "dashCategory1")
++                var seeAll1 = findChild(category1, "seeAll")
++                verify(category1.expandable);
++                verify(!category1.expanded);
++
++                mouseClick(seeAll1, seeAll1.width / 2, seeAll1.height / 2);
++                verify(!category0.expanded);
++                verify(category1.expanded);
++                tryCompare(category1, "height", category1.item.expandedHeight + seeAll1.height);
++                tryCompare(category1, "y", units.gu(5));
++            }
++
              function test_favorite_data() {
                  return [
                      { tag: "People", id: "MockScope1", favorite: true },