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

[Albert Astals Cid]

Make Navigation work when "jumping" to the non root

There's two fixes:
 * If the Navigation we jumped to is a leaf, list the model of the parent
 * If we're going back/left but we're already on index 0 of the list prepend the parent so we can continue going back

* Are there any related MPs required for this MP to build/function as expected?
No hard depend, but it needs to land with a
  https://code.launchpad.net/~stolowski/unity-scope-click/fix-1343242/+merge/243681
  https://code.launchpad.net/~stolowski/unity-scopes-shell/fix-current-nav-id/+merge/243679
to actually fix the bug.

 * 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

[Michael Zanetti (mzanetti)]

hmm... for some reason, after applying this I can only see the Music category in the store any more.

review: Needs Fixing

[Michael Zanetti (mzanetti)]

Combined with the other branches it seems to work fine.

 * 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.

it's gone

 * Did you make sure that the branch does not contain spurious tags?

yes

review: Approve

=== modified file 'qml/Dash/DashNavigationButton.qml'
--- qml/Dash/DashNavigationButton.qml	2014-10-23 11:59:22 +0000
+++ qml/Dash/DashNavigationButton.qml	2014-12-04 11:18:24 +0000
@@ -139,6 +139,17 @@
                 }
             }
             onGoBackToParentClicked: {
+                if (navigationListView.currentIndex == 0) {
+                    // This can happen if we jumped to the non root of a deep tree and the user
+                    // is now going back, create space in the list for the list to move "left"
+                    var aux = navigationListView.highlightMoveDuration;
+                    navigationListView.highlightMoveDuration = 0;
+                    navigationModel.insert(0, {"navigationId": navigation.parentNavigationId, "nullifyNavigation": false});
+                    navigationListView.currentIndex = navigationListView.currentIndex + 1;
+                    navigationListView.contentX = width * navigationListView.currentIndex;
+                    navigationListView.highlightMoveDuration = aux;
+                }
+
                 scope.setNavigationState(navigation.parentNavigationId, isAltNavigation);
                 isGoingBack = true;
                 navigationModel.setProperty(navigationListView.currentIndex - 1, "nullifyNavigation", false);
@@ -153,6 +164,9 @@
             }
         }
         onContentXChanged: {
+            if (navigationListView.highlightMoveDuration == 0)
+                return;
+
             if (contentX == width * navigationListView.currentIndex) {
                 if (isGoingBack) {
                     navigationModel.remove(navigationListView.currentIndex + 1);
@@ -175,9 +189,18 @@
     }
 
     onScopeChanged: {
+        setNewNavigation();
+    }
+
+    function setNewNavigation() {
         navigationModel.clear();
         if (scope && scope[hasNavigation]) {
-            navigationModel.append({"navigationId": scope[currentNavigationId], "nullifyNavigation": false});
+            var navigation = getNavigation(scope[currentNavigationId]);
+            if (navigation.count > 0) {
+                navigationModel.append({"navigationId": scope[currentNavigationId], "nullifyNavigation": false});
+            } else {
+                navigationModel.append({"navigationId": navigation.parentNavigationId, "nullifyNavigation": false});
+            }
         }
     }
 
@@ -186,20 +209,12 @@
         // This is duplicated since we can't have something based on the dynamic hasNavigation string property
         onHasNavigationChanged: {
             if (!root.isAltNavigation) {
-                if (scope.hasNavigation) {
-                    navigationModel.append({"navigationId": scope.currentNavigationId, "nullifyNavigation": false});
-                } else {
-                    navigationModel.clear();
-                }
+                setNewNavigation();
             }
         }
         onHasAltNavigationChanged: {
             if (root.isAltNavigation) {
-                if (scope.hasAltNavigation) {
-                    navigationModel.append({"navigationId": scope.currentAltNavigationId, "nullifyNavigation": false});
-                } else {
-                    navigationModel.clear();
-                }
+                setNewNavigation();
             }
         }
     }