@@ -71,12 +71,14 @@ FocusScope {
7171 property var maybePreviewIndex;
7272 property var maybePreviewResultsModel;
7373 property var maybePreviewLimitedCategoryItemCount;
74+ property string maybePreviewCategoryId;
7475
7576 function itemClicked(index, result, itemModel, resultsModel, limitedCategoryItemCount, categoryId) {
7677 scopeView.maybePreviewResult = result;
7778 scopeView.maybePreviewIndex = index;
7879 scopeView.maybePreviewResultsModel = resultsModel;
7980 scopeView.maybePreviewLimitedCategoryItemCount = limitedCategoryItemCount;
81+ scopeView.maybePreviewCategoryId = categoryId;
8082
8183 scope.activate(result, categoryId);
8284 }
@@ -86,13 +88,14 @@ FocusScope {
8688 scopeView.maybePreviewIndex = undefined;
8789 scopeView.maybePreviewResultsModel = undefined;
8890 scopeView.maybePreviewLimitedCategoryItemCount = undefined;
91+ scopeView.maybePreviewCategoryId = undefined;
8992
9093 if (scope.preview(result, categoryId)) {
91− openPreview(index, resultsModel, limitedCategoryItemCount);
94+ openPreview(index, resultsModel, limitedCategoryItemCount, categoryId);
9295 }
9396 }
9497
95− function openPreview(index, resultsModel, limitedCategoryItemCount) {
98+ function openPreview(index, resultsModel, limitedCategoryItemCount, categoryId) {
9699 if (limitedCategoryItemCount > 0) {
97100 previewLimitModel.model = resultsModel;
98101 previewLimitModel.limit = limitedCategoryItemCount;
@@ -102,6 +105,7 @@ FocusScope {
102105 }
103106 subPageLoader.initialIndex = -1;
104107 subPageLoader.initialIndex = index;
108+ subPageLoader.categoryId = categoryId;
105109 subPageLoader.openSubPage("preview");
106110 }
107111
@@ -151,10 +155,14 @@ FocusScope {
151155 onPreviewRequested: { // (QVariant const& result)
152156 if (result === scopeView.maybePreviewResult) {
153157 scopeView.maybePreviewResult = undefined;
154− openPreview(scopeView.maybePreviewIndex, scopeView.maybePreviewResultsModel, scopeView.maybePreviewLimitedCategoryItemCount);
158+ openPreview(scopeView.maybePreviewIndex,
159+ scopeView.maybePreviewResultsModel,
160+ scopeView.maybePreviewLimitedCategoryItemCount,
161+ scopeView.maybePreviewCategoryId);
155162 scopeView.maybePreviewIndex = undefined;
156163 scopeView.maybePreviewResultsModel = undefined;
157164 scopeView.maybePreviewLimitedCategoryItemCount = undefined;
165+ scopeView.maybePreviewCategoryId = undefined;
158166 }
159167 }
160168 }
@@ -737,6 +745,7 @@ FocusScope {
737745 property var scope: scopeView.scope
738746 property var scopeStyle: scopeView.scopeStyle
739747 property int initialIndex: -1
748+ property string categoryId
740749 property var model: null
741750
742751 readonly property bool processing: item && item.processing || false
@@ -768,6 +777,7 @@ FocusScope {
768777 item.open = Qt.binding(function() { return subPageLoader.open; } )
769778 item.initialIndex = Qt.binding(function() { return subPageLoader.initialIndex; } )
770779 item.model = Qt.binding(function() { return subPageLoader.model; } )
780+ item.categoryId = Qt.binding(function() { return subPageLoader.categoryId; } )
771781 }
772782 open = true;
773783 }