Merge lp:~mardy/unity8/lp1433442 into lp:unity8

[Alberto Mardegan]

Set currentIndex after the model change is completed

When setting the model, the list view will first emit the countChanged signal, then will change the currentIndex to 0 (see QtDeclarative git commit 22c6873 and https://bugreports.qt.io/browse/QTBUG-26604), and finally will emit the modelChanged signal.
If we set the currentIndex in the onCountChanged handler (as we were doing
before), the currentIndex would be reset to 0 shortly afterwards.

For some mysterious reason, the desired delegate was anyway shown until the bugfix for bug 1433442 was introduced; with that bugfix, the listview is more consistent and shows the delegate corresponding to the currentIndex.

Set currentIndex after the model change is completed

When setting the model, the list view will first emit the countChanged signal, then will change the currentIndex to 0 (see QtDeclarative git commit 22c6873 and https://bugreports.qt.io/browse/QTBUG-26604), and finally will emit the modelChanged signal.
If we set the currentIndex in the onCountChanged handler (as we were doing
before), the currentIndex would be reset to 0 shortly afterwards.

For some mysterious reason, the desired delegate was anyway shown until the bugfix for bug 1433442 was introduced; with that bugfix, the listview is more consistent and shows the delegate corresponding to the currentIndex.

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

No, although this change is mostly relevant when using libqt5quick5 from silo 29 (because without this change, that silo would cause a regression).

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

It isn't.

 * If you changed the UI, has there been a design review?

No visible UI changes.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1917
http://jenkins.qa.ubuntu.com/job/unity8-ci/6196/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/546/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/226/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/435/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/436/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/546/console

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

This is actually regressing (without the silo 29).

Is silo 29 ready/testable already?

review: Needs Fixing

[lp:~mardy/unity8/lp1433442]

1918. By Alberto Mardegan on 2015-08-14

Change index via positionViewAtIndex()

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1918
http://jenkins.qa.ubuntu.com/job/unity8-ci/6197/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/547/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/227/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/436/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/437/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/547/console

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

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

 * Did CI run pass?
It's kaboomed

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

review: Approve

[lp:~mardy/unity8/lp1433442]

1919. By Alberto Mardegan on 2015-08-17

Merge previews-in-order

Unmerged revisions

=== modified file 'qml/Dash/GenericScopeView.qml'
--- qml/Dash/GenericScopeView.qml	2015-08-06 10:46:10 +0000
+++ qml/Dash/GenericScopeView.qml	2015-08-17 11:32:22 +0000
@@ -99,23 +99,25 @@
     function itemPressedAndHeld(index, result, resultsModel, limitedCategoryItemCount, categoryId) {
         clearMaybePreviewData();
 
-        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 {
@@ -163,7 +165,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-07-07 15:52:19 +0000
+++ qml/Dash/PreviewListView.qml	2015-08-17 11:32:22 +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
 
@@ -84,10 +86,10 @@
             }
         }
 
-        onCountChanged: {
-            if (count > 0 && initialIndex >= 0) {
-                currentIndex = initialIndex;
-                initialIndex = -1;
+        onModelChanged: {
+            if (count > 0 && initialIndex >= 0 && !usedInitialIndex) {
+                usedInitialIndex = true;
+                previewListView.positionViewAtIndex(initialIndex, ListView.SnapPosition);
             }
         }
 
@@ -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
         }