git.iko.soy/unity8
on xenial help sign in
Reverted some more unnecessary changes
commitc4c44716b16bcb76e139621b8d353cb4871b29ce authorMarcus Tomlinson <marcus.tomlinson@canonical.com> dateThu 18 Sep 2014, 07:15 (12 years ago) parentf0e82f7
3 files changed+10−20
compare with xenial
unifiedsplit
qml/Dash/ScopesOverview.qml+8−13 qml/Dash/ScopesOverviewAll.qml+2−2 tests/qmltests/Dash/tst_PreviewListView.qml−5
qml/Dash/ScopesOverview.qml+8−13
@@ -325,19 +325,14 @@ Item {
325325 }
326326 }
327327 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
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− }
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;
341336 }
342337 }
343338 }
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, var result)
29+ signal pressAndHold(int index)
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, result);
51+ root.pressAndHold(index);
5252 }
5353 }
5454}
tests/qmltests/Dash/tst_PreviewListView.qml−5
@@ -36,10 +36,6 @@ Rectangle {
3636 id: mockResultsModel
3737 }
3838
39− Unity.FakePreviewModel {
40− id: mockPreviewModel
41− }
42−
4339 PreviewListView {
4440 id: listView
4541 anchors.fill: parent
@@ -65,7 +61,6 @@ Rectangle {
6561 function init() {
6662 listView.model = mockResultsModel;
6763 listView.currentIndex = 1;
68− listView.currentItem.previewModel = mockPreviewModel;
6964 listView.open = true;
7065 verify(testCase.mouseArea, "Can't find the processingMouseArea object.");
7166 }