git.iko.soy/unity8
on xenial help sign in
Fixed broken previewing in Scopes Overview
7e54e39Marcus Tomlinson
qml/Dash/ScopesOverview.qml+13−8
compare with xenial
unifiedsplit
@@ -325,14 +325,19 @@ Item {
325 }
325 }
326 }
326 }
327 onPressAndHold: {
327 onPressAndHold: {
328+ var previewStack = root.scope.preview(result);
329+ if (previewStack)
330+ {
328− // Preview can call openScope so make sure restorePosition and restoreSize are set
331+ // Preview can call openScope so make sure restorePosition and restoreSize are set
329− scopesOverviewXYScaler.restorePosition = undefined;
332+ scopesOverviewXYScaler.restorePosition = undefined;
330− scopesOverviewXYScaler.restoreSize = allCardSize;
333+ scopesOverviewXYScaler.restoreSize = allCardSize;
331−
334+
335+ previewListView.previewModel = previewStack.getPreviewModel(0);
332− previewListView.model = target.model;
336+ previewListView.model = target.model;
333− previewListView.currentIndex = -1;
337+ previewListView.currentIndex = -1;
334− previewListView.currentIndex = index;
338+ previewListView.currentIndex = index;
335− previewListView.open = true;
339+ previewListView.open = true;
340+ }
336 }
341 }
337 }
342 }
338 }
343 }
qml/Dash/ScopesOverviewAll.qml+2−2
@@ -26,7 +26,7 @@ Flickable {
26 property real extraHeight: 0
26 property real extraHeight: 0
27
27
28 signal clicked(int index, var result, var item, var itemModel)
28 signal clicked(int index, var result, var item, var itemModel)
29− signal pressAndHold(int index)
29+ signal pressAndHold(int index, var result)
30
30
31 contentHeight: cardGrid.expandedHeight + extraHeight
31 contentHeight: cardGrid.expandedHeight + extraHeight
32 contentWidth: cardGrid.width
32 contentWidth: cardGrid.width
@@ -48,7 +48,7 @@ Flickable {
48 root.clicked(index, result, item, itemModel);
48 root.clicked(index, result, item, itemModel);
49 }
49 }
50 onPressAndHold: {
50 onPressAndHold: {
51− root.pressAndHold(index);
51+ root.pressAndHold(index, result);
52 }
52 }
53 }
53 }
54}
54}