git.iko.soy/unity8
on xenial help sign in
collapse any open preview when programmatically switching current dash index. Fixes: https://bugs.launchpad.net/bugs/1221137.

Approved by PS Jenkins bot, Michał Sawicz.

commit174fa523aba8aef0b77d62d1ab7fef0e01be133e authorMichael Zanetti <michael.zanetti@canonical.com> dateWed 18 Sep 2013, 04:20 (13 years ago) parent94e120ecd5b8d3
3 files changed+7−2
compare with xenial
unifiedsplit
Dash/GenericScopeView.qml+3−1 tests/qmltests/Dash/tst_DashContent.qml+1−1 tests/qmltests/Dash/tst_GenericScopeView.qml+3
Dash/GenericScopeView.qml+3−1
@@ -21,10 +21,11 @@ import "../Components/ListItems" as ListItems
2121
2222ScopeView {
2323 id: scopeView
24− property alias previewShown: previewLoader.onScreen
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+1−1
@@ -106,7 +106,7 @@ Item {
106106 contentEndReachedSpy.clear()
107107 clear_scope_status();
108108
109− // clear, wait for dahs to empty and load scopes.
109+ // clear, wait for dash to empty and load scopes.
110110 var dashContentList = findChild(dashContent, "dashContentList");
111111 verify(dashContentList != undefined)
112112 scopesModel.clear();
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 }