Unity 8

Merge lp:~josharenson/unity8/autoscroller-alternative into lp:unity8

autoscroller-alternative
Merge into trunk

Proposed by Josh Arenson on 2016-11-17

Status:

Merged

Approved by:

Andrea Cimitan on 2017-01-05

Approved revision:

2666

Merged at revision:

2762

Proposed branch:

lp:~josharenson/unity8/autoscroller-alternative

Merge into:

lp:unity8

Diff against target:

326 lines (+140/-48)

6 files modified

qml/Dash/ScopesList.qml (+120/-39)
qml/Dash/ScopesListCategory.qml (+3/-0)
tests/mocks/Unity/fake_scopes.cpp (+7/-0)
tests/qmltests/Dash/tst_Dash.qml (+6/-5)
tests/qmltests/Dash/tst_DashContent.qml (+3/-3)
tests/qmltests/Dash/tst_DashShell.qml (+1/-1)

To merge this branch:

bzr merge lp:~josharenson/unity8/autoscroller-alternative

Medium

In Progress

Link a bug report

Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration		Approve on 2017-01-05
Andrea Cimitan (community)		2016-11-17	Approve on 2017-01-05
Review via email: mp+311207@code.launchpad.net

Commit Message

Allow the scopes list to automatically scroll when a scope is being dragged past the bounds of the screen.

Description of the Change

* Are there any related MPs required for this MP to build/function as expected? Please list.
lp:~josharenson/unity-scopes-shell/fix-overview-results-sorting which fixes lp:1646947

* 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?
There has not.

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/2507/rebuild

review: Needs Fixing (continuous-integration)

lp:~josharenson/unity8/autoscroller-alternative updated on 2016-11-17

2661. By Josh Arenson on 2016-11-17: Fix content tests
2662. By Josh Arenson on 2016-11-17: Fix dash tests

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

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

review: Needs Fixing (continuous-integration)

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

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

review: Approve (continuous-integration)

lp:~josharenson/unity8/autoscroller-alternative updated on 2016-12-01

2663. By Josh Arenson on 2016-12-01: Fix warnings and cleanup

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-12-02:

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

review: Needs Fixing (continuous-integration)

lp:~josharenson/unity8/autoscroller-alternative updated on 2016-12-02

2664. By Josh Arenson on 2016-12-02: Merge trunk

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-12-02:

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-12-02:

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

review: Needs Fixing (continuous-integration)

lp:~josharenson/unity8/autoscroller-alternative updated on 2016-12-14

2665. By Josh Arenson on 2016-12-14: Merge trunk

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-12-14:

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-12-19:

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

review: Needs Fixing (continuous-integration)

Andrea Cimitan (cimi) wrote on 2016-12-21:

Triggered a rebuild

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-12-21:

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

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) wrote on 2016-12-23:

Text conflict in tests/qmltests/Stage/tst_DesktopStage.qml
1 conflicts encountered.

Albert Astals Cid (aacid) wrote on 2016-12-23:

Text conflict in tests/qmltests/Stage/tst_DesktopStage.qml
1 conflicts encountered.

lp:~josharenson/unity8/autoscroller-alternative updated on 2017-01-03

2666. By Josh Arenson on 2017-01-03: Merge trunk

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-01-03:

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

review: Needs Fixing (continuous-integration)

Andrea Cimitan (cimi) wrote on 2017-01-05:

I cannot reproduce this test failure locally, so I assume it was unrelated

review: Approve

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-01-05:

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

review: Approve (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:

Josh Arenson

Mohammad Rakibul Hasan

Unity Team

 === modified file 'qml/Dash/ScopesList.qml'
 --- qml/Dash/ScopesList.qml	2016-07-27 16:23:18 +0000
 +++ qml/Dash/ScopesList.qml	2017-01-03 17:43:44 +0000
@@ -22,6 +22,8 @@
  Item {
      id: root
++    property alias scopesListFlickable: scopesListFlickable
++
      // Properties set by parent
      property var scope: null
@@ -35,10 +37,97 @@
      signal requestFavoriteMoveTo(string scopeId, int index)
      signal requestRestore(string scopeId)
++    Item {
++        id: autoscroller
++
++        property bool dragging: false
++        property var dragItem: new Object();
++
++        readonly property bool fuzzyAtYEnd: {
++            var contentHeight = root.scopesListFlickable.contentHeight
++            var contentY = root.scopesListFlickable.contentY
++            var dragItemHeight = dragItem ? autoscroller.dragItem.height : 0
++            var flickableHeight = root.scopesListFlickable.height
++
++            if (!dragItem) {
++                return true;
++            } else {
++                return contentY >= (contentHeight - flickableHeight) - dragItemHeight
++            }
++        }
++
++        readonly property real bottomBoundary: {
++            var contentHeight = root.scopesListFlickable.contentHeight
++            var contentY = root.scopesListFlickable.contentY
++            var dragItemHeight = dragItem ? autoscroller.dragItem.height : 0
++            var heightRatio = root.scopesListFlickable.visibleArea.heightRatio
++
++            if (!dragItem) {
++                return true;
++            } else {
++                return (heightRatio * contentHeight) -
++                       (1.5 * dragItemHeight) + contentY
++            }
++        }
++
++        readonly property int delayMs: 32
++        readonly property real topBoundary: dragItem ? root.scopesListFlickable.contentY + (.5 * dragItem.height) : 0
++
++        visible: false
++        readonly property real maxStep: units.dp(10)
++        function stepSize(scrollingUp) {
++            var delta, step;
++            if (scrollingUp) {
++                delta = dragItem.y - topBoundary;
++                delta /= (1.5 * dragItem.height);
++            } else {
++                delta = dragItem.y - bottomBoundary;
++                delta /= (1.5 * dragItem.height);
++            }
++
++            step = Math.abs(delta) * autoscroller.maxStep
++            return Math.ceil(step);
++        }
++
++
++        Timer {
++            interval: autoscroller.delayMs
++            running: autoscroller.dragItem ? (autoscroller.dragging &&
++                autoscroller.dragItem.y < autoscroller.topBoundary &&
++                !root.scopesListFlickable.atYBeginning) : false
++            repeat: true
++            onTriggered: {
++                root.scopesListFlickable.contentY -= autoscroller.stepSize(true);
++                autoscroller.dragItem.y -= autoscroller.stepSize(true);
++            }
++        }
++
++        Timer {
++            interval: autoscroller.delayMs
++            running: autoscroller.dragItem ? (autoscroller.dragging &&
++                autoscroller.dragItem.y >= autoscroller.bottomBoundary &&
++                !autoscroller.fuzzyAtYEnd) : false
++            repeat: true
++            onTriggered: {
++                root.scopesListFlickable.contentY += autoscroller.stepSize(false);
++                autoscroller.dragItem.y += autoscroller.stepSize(false);
++            }
++        }
++    }
++
++    function autoscroll(dragging, dragItem) {
++        if (dragging) {
++            autoscroller.dragItem = dragItem
++            autoscroller.dragging = true;
++        } else {
++            autoscroller.dragItem = null;
++            autoscroller.dragging = false
++        }
++    }
++
      state: "browse"
--    property var scopeStyle: ScopeStyle {
--    }
++    property var scopeStyle: ScopeStyle {}
      onStateChanged: {
          if (state == "edit") {
@@ -73,7 +162,8 @@
          z: 1
+     }
--    Flickable {
++    ListView {
++        id: scopesListFlickable
          objectName: "scopesListFlickable"
          anchors {
              top: header.bottom
@@ -82,43 +172,34 @@
              right: parent.right
+         }
          clip: true
--        contentWidth: root.width
--        contentHeight: column.height
--        onContentHeightChanged: returnToBounds();
--        Column {
--            id: column
--            Repeater {
--                model: scope ? scope.categories : null
--
--                delegate: Loader {
--                    asynchronous: true
--                    width: root.width
--                    active: results.count > 0
--                    visible: active
--                    sourceComponent: ScopesListCategory {
--                        objectName: "scopesListCategory" + categoryId
--
--                        model: results
--
--                        title: {
--                            if (isFavoritesFeed) return i18n.tr("Home");
--                            else if (isAlsoInstalled) return i18n.tr("Also installed");
--                            else return name;
--                        }
--
--                        editMode: root.state == "edit"
--
--                        scopeStyle: root.scopeStyle
--                        isFavoritesFeed: categoryId == "favorites"
--                        isAlsoInstalled: categoryId == "other"
--
--                        onRequestFavorite: root.requestFavorite(scopeId, favorite);
--                        onRequestEditMode: root.state = "edit";
--                        onRequestScopeMoveTo: root.requestFavoriteMoveTo(scopeId, index);
--                        onRequestActivate: root.scope.activate(result, categoryId);
--                        onRequestRestore: root.requestRestore(scopeId);
++        model: scope ? scope.categories : null
++            delegate: Loader {
++                asynchronous: true
++                width: root.width
++                active: results.count > 0
++                visible: active
++                sourceComponent: ScopesListCategory {
++                    objectName: "scopesListCategory" + categoryId
++
++                    model: results
++
++                    title: {
++                        if (isFavoritesFeed) return i18n.tr("Home");
++                        else if (isAlsoInstalled) return i18n.tr("Also installed");
++                        else return name;
+                     }
--                }
++
++                    editMode: root.state == "edit"
++                    scopeStyle: root.scopeStyle
++                    isFavoritesFeed: categoryId == "favorites"
++                    isAlsoInstalled: categoryId == "other"
++
++                    onItemDragging: autoscroll(dragging, dragItem);
++                    onRequestFavorite: root.requestFavorite(scopeId, favorite);
++                    onRequestEditMode: root.state = "edit";
++                    onRequestScopeMoveTo: root.requestFavoriteMoveTo(scopeId, index);
++                    onRequestActivate: root.scope.activate(result, categoryId);
++                    onRequestRestore: root.requestRestore(scopeId);
+             }
+         }
+     }
 === modified file 'qml/Dash/ScopesListCategory.qml'
 --- qml/Dash/ScopesListCategory.qml	2016-10-04 09:32:15 +0000
 +++ qml/Dash/ScopesListCategory.qml	2017-01-03 17:43:44 +0000
@@ -32,6 +32,7 @@
      visible: !editMode || isFavoritesFeed
++    signal itemDragging(bool dragging, var dragItem)
      signal requestFavorite(string scopeId, bool favorite)
      signal requestEditMode()
      signal requestScopeMoveTo(string scopeId, int index)
@@ -109,6 +110,7 @@
                  onRequestFavorite: root.requestFavorite(model.scopeId, favorite);
                  onHandlePressed: {
                      if (editMode) {
++                        root.itemDragging(true, dragItem);
                          handle.drag.target = dragItem;
                          handle.drag.maximumX = units.gu(1);
                          handle.drag.minimumX = units.gu(1);
@@ -126,6 +128,7 @@
+                     }
+                 }
                  onHandleReleased: {
++                    root.itemDragging(false, dragItem);
                      if (dragItem.visible) {
                          handle.drag.target = undefined;
                          dragItem.visible = false;
 === modified file 'tests/mocks/Unity/fake_scopes.cpp'
 --- tests/mocks/Unity/fake_scopes.cpp	2016-06-07 03:33:35 +0000
 +++ tests/mocks/Unity/fake_scopes.cpp	2017-01-03 17:43:44 +0000
@@ -73,6 +73,13 @@
      addScope(longNavigationScope);
      addScope(new Scope("NullPreviewScope", "NPS", false, this, 1, true));
++
++    // Add enough scopes to test autoscrolling on the scopes managment page
++    for (int i = 0; i < 20; i++) {
++        addScope(new Scope("UselessScope" + QString::number(i),
++                           "US" + QString::number(i), true, this));
++    }
++
      m_scopesOverview = new ScopesOverview(this);
      if (!m_loaded) {
 === modified file 'tests/qmltests/Dash/tst_Dash.qml'
 --- tests/qmltests/Dash/tst_Dash.qml	2016-11-21 14:10:08 +0000
 +++ tests/qmltests/Dash/tst_Dash.qml	2017-01-03 17:43:44 +0000
@@ -58,7 +58,7 @@
              tryCompare(dashContentList, "count", 0);
              scopes.load();
              tryCompare(dashContentList, "currentIndex", 0);
--            tryCompare(dashContentList, "count", 8);
++            tryCompare(dashContentList, "count", 28);
              tryCompare(scopes, "loaded", true);
              tryCompareFunction(function() {
                  var mockScope1Loader = findChild(dash, "scopeLoader0");
@@ -589,10 +589,10 @@
              // Go to a temp scope
              open_manage_dash();
++            flickToYEnd(findChild(dash, "scopesListFlickable"));
              var nonfavScopesListCategory = findChild(dash, "scopesListCategoryother");
              var nonfavScopesListCategoryList = findChild(nonfavScopesListCategory, "scopesListCategoryInnerList");
--            flickToYEnd(findChild(dash, "scopesListFlickable"));
              tryCompare(nonfavScopesListCategoryList, "currentIndex", 0);
              mouseClick(nonfavScopesListCategoryList.currentItem);
              var dashTempScopeItem = findChild(dash, "dashTempScopeItem");
@@ -661,13 +661,14 @@
              // Go to a temp scope
              open_manage_dash();
--            var nonfavScopesListCategory = findChild(dash, "scopesListCategoryother");
--            var nonfavScopesListCategoryList = findChild(nonfavScopesListCategory, "scopesListCategoryInnerList");
              var scopesListFlickable = findChild(dash, "scopesListFlickable");
++            flickToYEnd(scopesListFlickable);
++
++            var nonfavScopesListCategory = findChild(dash, "scopesListCategoryother");
++            var nonfavScopesListCategoryList = findChild(nonfavScopesListCategory, "scopesListCategoryInnerList");
              tryCompare(nonfavScopesListCategoryList, "currentIndex", 0);
              // Ensure the non-favorites, located at the bottom, are visible
--            flickToYEnd(scopesListFlickable);
              mouseClick(nonfavScopesListCategoryList.currentItem);
              var dashTempScopeItem = findChild(dash, "dashTempScopeItem");
              tryCompare(dashTempScopeItem, "x", 0);
 === modified file 'tests/qmltests/Dash/tst_DashContent.qml'
 --- tests/qmltests/Dash/tst_DashContent.qml	2016-11-12 16:33:58 +0000
 +++ tests/qmltests/Dash/tst_DashContent.qml	2017-01-03 17:43:44 +0000
@@ -70,7 +70,7 @@
          function loadScopes() {
              scopeLoadedSpy.clear();
              scopesModel.load();
--            tryCompare(scopeLoadedSpy, "count", 8, 15000);
++            tryCompare(scopeLoadedSpy, "count", 28, 15000);
              tryCompare(scopesModel, "loaded", true);
              tryCompareFunction(function() {
                  var mockScope1Loader = findChild(shell, "scopeLoader0");
@@ -124,7 +124,7 @@
              loadScopes();
--            compare(dashContentList.count, 8);
++            compare(dashContentList.count, 28);
              verify(dashContentList.currentIndex >= 0 && dashContentList.currentIndex < dashContentList.count);
+         }
@@ -181,7 +181,7 @@
              // test greater than scope count.
              var currentScopeIndex = dashContent.currentIndex;
--            dashContent.setCurrentScopeAtIndex(18, true, false);
++            dashContent.setCurrentScopeAtIndex(29, true, false);
              compare(dashContent.currentIndex, currentScopeIndex, "Scope should not change if changing to greater index than count");
+         }
 === modified file 'tests/qmltests/Dash/tst_DashShell.qml'
 --- tests/qmltests/Dash/tst_DashShell.qml	2016-11-29 18:27:40 +0000
 +++ tests/qmltests/Dash/tst_DashShell.qml	2017-01-03 17:43:44 +0000
@@ -60,7 +60,7 @@
              tryCompare(dashContentList, "count", 0);
              scopes.load();
              tryCompare(dashContentList, "currentIndex", 0);
--            tryCompare(dashContentList, "count", 8);
++            tryCompare(dashContentList, "count", 28);
              tryCompare(scopes, "loaded", true);
              tryCompareFunction(function() {
                  var mockScope1Loader = findChild(dash, "scopeLoader0");