on xenial help sign in
Fixed broken previewing in Scopes Overview
commit7e54e3912dc4f4033809e3ac6d39a426ef623e7e authorMarcus Tomlinson <marcus.tomlinson@canonical.com> dateWed 17 Sep 2014, 07:20 (12 years ago) parent2764051
2 files changed+15−10
qml/Dash/ScopesOverview.qml+13−8 qml/Dash/ScopesOverviewAll.qml+2−2
qml/Dash/ScopesOverview.qml+13−8
@@ -325,14 +325,19 @@ Item {
325325 }
326326 }
327327 onPressAndHold: {
328− // Preview can call openScope so make sure restorePosition and restoreSize are set
329− scopesOverviewXYScaler.restorePosition = undefined;
330− scopesOverviewXYScaler.restoreSize = allCardSize;
331−
332− previewListView.model = target.model;
333− previewListView.currentIndex = -1;
334− previewListView.currentIndex = index;
335− previewListView.open = true;
328+ var previewStack = root.scope.preview(result);
329+ if (previewStack)
330+ {
331+ // Preview can call openScope so make sure restorePosition and restoreSize are set
332+ scopesOverviewXYScaler.restorePosition = undefined;
333+ scopesOverviewXYScaler.restoreSize = allCardSize;
334+
335+ previewListView.previewModel = previewStack.getPreviewModel(0);
336+ previewListView.model = target.model;
337+ previewListView.currentIndex = -1;
338+ previewListView.currentIndex = index;
339+ previewListView.open = true;
340+ }
336341 }
337342 }
338343 }
qml/Dash/ScopesOverviewAll.qml+2−2
@@ -26,7 +26,7 @@ Flickable {
2626 property real extraHeight: 0
2727
2828 signal clicked(int index, var result, var item, var itemModel)
29− signal pressAndHold(int index)
29+ signal pressAndHold(int index, var result)
3030
3131 contentHeight: cardGrid.expandedHeight + extraHeight
3232 contentWidth: cardGrid.width
@@ -48,7 +48,7 @@ Flickable {
4848 root.clicked(index, result, item, itemModel);
4949 }
5050 onPressAndHold: {
51− root.pressAndHold(index);
51+ root.pressAndHold(index, result);
5252 }
5353 }
5454}