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

[Albert Astals Cid]

Optimize scope.preview() calls

Don't call it in PreviewListView if we're still not open (i.e the list is being constructed)
Also reuse the call we do in GenericScopeView and pass it down for PreviewListView to use

 * Are there any related MPs required for this MP to build/function as expected?
Prerequistite

 * 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

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1858
http://jenkins.qa.ubuntu.com/job/unity8-ci/6149/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/494/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/179/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/388/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/389/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/494/console

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

review: Needs Fixing (continuous-integration)

[Andrea Cimitan (cimi)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
y
 * Did CI run pass? If not, please explain why.
unrelated
 * Did you make sure that the branch does not contain spurious tags?
y

review: Approve

=== modified file 'qml/Dash/GenericScopeView.qml'
--- qml/Dash/GenericScopeView.qml	2015-08-05 15:39:58 +0000
+++ qml/Dash/GenericScopeView.qml	2015-08-05 15:39:58 +0000
@@ -95,23 +95,25 @@
         scopeView.maybePreviewLimitedCategoryItemCount = undefined;
         scopeView.maybePreviewCategoryId = "";
 
-        if (scope.preview(result, categoryId)) {
-            openPreview(index, resultsModel, limitedCategoryItemCount, categoryId);
-        }
+        openPreview(result, index, resultsModel, limitedCategoryItemCount, categoryId);
     }
 
-    function openPreview(index, resultsModel, limitedCategoryItemCount, categoryId) {
-        if (limitedCategoryItemCount > 0) {
-            previewLimitModel.model = resultsModel;
-            previewLimitModel.limit = limitedCategoryItemCount;
-            subPageLoader.model = previewLimitModel;
-        } else {
-            subPageLoader.model = resultsModel;
+    function openPreview(result, index, resultsModel, limitedCategoryItemCount, categoryId) {
+        var previewStack = scope.preview(result, categoryId);
+        if (previewStack) {
+            if (limitedCategoryItemCount > 0) {
+                previewLimitModel.model = resultsModel;
+                previewLimitModel.limit = limitedCategoryItemCount;
+                subPageLoader.model = previewLimitModel;
+            } else {
+                subPageLoader.model = resultsModel;
+            }
+            subPageLoader.initialIndex = -1;
+            subPageLoader.initialIndex = index;
+            subPageLoader.categoryId = categoryId;
+            subPageLoader.previewStack = previewStack;
+            subPageLoader.openSubPage("preview");
         }
-        subPageLoader.initialIndex = -1;
-        subPageLoader.initialIndex = index;
-        subPageLoader.categoryId = categoryId;
-        subPageLoader.openSubPage("preview");
     }
 
     Binding {
@@ -159,7 +161,8 @@
         onHideDash: subPageLoader.closeSubPage()
         onPreviewRequested: { // (QVariant const& result)
             if (result === scopeView.maybePreviewResult) {
-                openPreview(scopeView.maybePreviewIndex,
+                openPreview(result,
+                            scopeView.maybePreviewIndex,
                             scopeView.maybePreviewResultsModel,
                             scopeView.maybePreviewLimitedCategoryItemCount,
                             scopeView.maybePreviewCategoryId);
@@ -758,6 +761,7 @@
         property var scope: scopeView.scope
         property var scopeStyle: scopeView.scopeStyle
         property int initialIndex: -1
+        property var previewStack;
         property string categoryId
         property var model: null
 
@@ -791,6 +795,8 @@
                 item.initialIndex = Qt.binding(function() { return subPageLoader.initialIndex; } )
                 item.model = Qt.binding(function() { return subPageLoader.model; } )
                 item.categoryId = Qt.binding(function() { return subPageLoader.categoryId; } )
+                item.initialIndexPreviewStack = subPageLoader.previewStack;
+                subPageLoader.previewStack = null;
             }
             open = true;
         }

=== modified file 'qml/Dash/PreviewListView.qml'
--- qml/Dash/PreviewListView.qml	2015-08-05 15:39:58 +0000
+++ qml/Dash/PreviewListView.qml	2015-08-05 15:39:58 +0000
@@ -24,9 +24,11 @@
     id: root
 
     property int initialIndex: -1
+    property var initialIndexPreviewStack: null
     property var scope: null
     property var scopeStyle: null
     property string categoryId
+    property bool usedInitialIndex: false
 
     property alias showSignatureLine: header.showSignatureLine
 
@@ -85,9 +87,9 @@
         }
 
         onCountChanged: {
-            if (count > 0 && initialIndex >= 0) {
+            if (count > 0 && initialIndex >= 0 && !usedInitialIndex) {
+                usedInitialIndex = true;
                 currentIndex = initialIndex;
-                initialIndex = -1;
             }
         }
 
@@ -100,8 +102,16 @@
             isCurrent: ListView.isCurrentItem
 
             previewModel: {
-                var previewStack = root.scope.preview(result, root.categoryId);
-                return previewStack.getPreviewModel(0);
+                if (root.open) {
+                    if (index === root.initialIndex) {
+                        return root.initialIndexPreviewStack.getPreviewModel(0);
+                    } else {
+                        var previewStack = root.scope.preview(result, root.categoryId);
+                        return previewStack.getPreviewModel(0);
+                    }
+                } else {
+                    return null;
+                }
             }
             scopeStyle: root.scopeStyle
         }