git.iko.soy/unity8
on xenial help sign in
new solution
commit36fd3426df3db9db8725d4fe743984ed3f78035e authorMichael Zanetti <michael.zanetti@canonical.com> dateTue 17 Sep 2013, 18:40 (13 years ago) parent0d9d9d8
4 files changed+8−26
compare with xenial
unifiedsplit
Dash/DashContent.qml+2−7 Dash/GenericScopeView.qml+3−1 tests/qmltests/Dash/tst_DashContent.qml−18 tests/qmltests/Dash/tst_GenericScopeView.qml+3
Dash/DashContent.qml+2−7
@@ -64,13 +64,8 @@ Item {
6464 }
6565 set_current_index = undefined;
6666
67− if (dashContentList.count > index) {
68−
69− // collapse any currently shown preview
70− if (dashContentList.currentItem && dashContentList.currentItem.item.previewShown) {
71− dashContentList.currentItem.item.previewShown = false;
72− }
73−
67+ if (dashContentList.count > index)
68+ {
7469 dashContentList.currentIndex = index
7570
7671 if (reset) {
Dash/GenericScopeView.qml+3−1
@@ -21,10 +21,11 @@ import "../Components/ListItems" as ListItems
2121
2222ScopeView {
2323 id: scopeView
24− property alias previewShown: previewLoader.open
24+ readonly property alias previewShown: previewLoader.onScreen
2525
2626 onIsCurrentChanged: {
2727 pageHeader.resetSearch();
28+ previewLoader.open = false;
2829 }
2930
3031 onMovementStarted: categoryView.showHeader()
@@ -246,6 +247,7 @@ ScopeView {
246247 }
247248
248249 Loader {
250+ objectName: "previewLoader"
249251 id: previewLoader
250252 property var previewData
251253 height: effect.bottomGapPx - effect.topGapPx
tests/qmltests/Dash/tst_DashContent.qml−18
@@ -178,24 +178,6 @@ Item {
178178 compare(dashContent.currentIndex, currentScopeIndex, "Scope should not change if changing to greater index than count");
179179 }
180180
181− function test_set_current_scope_index_closes_preview() {
182− var dashContentList = findChild(dashContent, "dashContentList");
183− tryCompare(dashContentList, "count", 5);
184− dashContentList.currentIndex = 0;
185− tryCompare(dashContentList.currentItem, "progress", 1);
186− var itemBeforeSwitching = dashContentList.currentItem;
187−
188− waitForRendering(itemBeforeSwitching)
189−
190− itemBeforeSwitching.item.previewShown = true;
191−
192− var next_index = 1;
193−
194− dashContent.setCurrentScopeAtIndex(next_index, true, false);
195− tryCompare(dashContent, "currentIndex", next_index);
196− compare(itemBeforeSwitching.item.previewShown, false);
197− }
198−
199181 function get_current_item_object_name() {
200182 var dashContentList = findChild(dashContent, "dashContentList");
201183 verify(dashContentList != undefined);
tests/qmltests/Dash/tst_GenericScopeView.qml+3
@@ -44,10 +44,13 @@ Item {
4444
4545 function test_isCurrent() {
4646 var pageHeader = findChild(genericScopeView, "pageHeader");
47+ var previewLoader = findChild(genericScopeView, "previewLoader");
4748 genericScopeView.isCurrent = true
4849 pageHeader.searchQuery = "test"
50+ previewLoader.open = true
4951 genericScopeView.isCurrent = false
5052 tryCompare(pageHeader, "searchQuery", "")
53+ tryCompare(genericScopeView, "previewShown", false);
5154 }
5255 }
5356 }