git.iko.soy/unity8
on xenial help sign in
Reverted some more unnecessary changes
c4c4471Marcus Tomlinson
qml/Dash/ScopesOverview.qml+8−13
compare with xenial
unifiedsplit
@@ -325,19 +325,14 @@ Item {
325 }
325 }
326 }
326 }
327 onPressAndHold: {
327 onPressAndHold: {
328− var previewStack = root.scope.preview(result);
329− if (previewStack)
330− {
331− // Preview can call openScope so make sure restorePosition and restoreSize are set
328+ // Preview can call openScope so make sure restorePosition and restoreSize are set
332− scopesOverviewXYScaler.restorePosition = undefined;
329+ scopesOverviewXYScaler.restorePosition = undefined;
333− scopesOverviewXYScaler.restoreSize = allCardSize;
330+ scopesOverviewXYScaler.restoreSize = allCardSize;
334−
331+
335− previewListView.previewModel = previewStack.getPreviewModel(0);
336− previewListView.model = target.model;
332+ previewListView.model = target.model;
337− previewListView.currentIndex = -1;
333+ previewListView.currentIndex = -1;
338− previewListView.currentIndex = index;
334+ previewListView.currentIndex = index;
339− previewListView.open = true;
335+ previewListView.open = true;
340− }
341 }
336 }
342 }
337 }
343 }
338 }
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, var result)
29+ signal pressAndHold(int index)
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, result);
51+ root.pressAndHold(index);
52 }
52 }
53 }
53 }
54}
54}
tests/qmltests/Dash/tst_PreviewListView.qml−5
@@ -36,10 +36,6 @@ Rectangle {
36 id: mockResultsModel
36 id: mockResultsModel
37 }
37 }
38
38
39− Unity.FakePreviewModel {
40− id: mockPreviewModel
41− }
42−
43 PreviewListView {
39 PreviewListView {
44 id: listView
40 id: listView
45 anchors.fill: parent
41 anchors.fill: parent
@@ -65,7 +61,6 @@ Rectangle {
65 function init() {
61 function init() {
66 listView.model = mockResultsModel;
62 listView.model = mockResultsModel;
67 listView.currentIndex = 1;
63 listView.currentIndex = 1;
68− listView.currentItem.previewModel = mockPreviewModel;
69 listView.open = true;
64 listView.open = true;
70 verify(testCase.mouseArea, "Can't find the processingMouseArea object.");
65 verify(testCase.mouseArea, "Can't find the processingMouseArea object.");
71 }
66 }