git.iko.soy/unity8
on xenial help sign in
Activate all results in click scope by default. Fixes: 1341262

Approved by: Alejandro J. Cura, PS Jenkins bot, Albert Astals Cid

commite1249222b51ff8adb12f4ea31b34044137df5f0f authorMichał Sawicz <michal.sawicz@canonical.com> dateMon 14 Jul 2014, 18:19 (12 years ago) parent0d043a9ecca325
2 files changed+5−5
compare with xenial
unifiedsplit
qml/Dash/GenericScopeView.qml+1−1 tests/qmltests/Dash/tst_GenericScopeView.qml+4−4
qml/Dash/GenericScopeView.qml+1−1
@@ -193,7 +193,7 @@ FocusScope {
193193 Connections {
194194 target: rendererLoader.item
195195 onClicked: {
196− if (scopeView.scope.id === "scopes" || (scopeView.scope.id == "clickscope" && (categoryId == "local" || categoryId == "store"))) {
196+ if (scopeView.scope.id === "scopes" || scopeView.scope.id == "clickscope") {
197197 // TODO Technically it is possible that calling activate() will make the scope emit
198198 // previewRequested so that we show a preview but there's no scope that does that yet
199199 // so it's not implemented
tests/qmltests/Dash/tst_GenericScopeView.qml+4−4
@@ -56,7 +56,7 @@ Item {
5656 property Item previewListView: findChild(genericScopeView, "previewListView")
5757
5858 function init() {
59− genericScopeView.scope = scopes.getScope(2)
59+ genericScopeView.scope = scopes.getScope(1)
6060 shell.width = units.gu(120)
6161 genericScopeView.categoryView.positionAtBeginning();
6262 tryCompare(genericScopeView.categoryView, "contentY", 0)
@@ -76,13 +76,13 @@ Item {
7676
7777 function test_showDash() {
7878 testCase.previewListView.open = true;
79− scopes.getScope(2).showDash();
79+ scopes.getScope(1).showDash();
8080 tryCompare(testCase.previewListView, "open", false);
8181 }
8282
8383 function test_hideDash() {
8484 testCase.previewListView.open = true;
85− scopes.getScope(2).hideDash();
85+ scopes.getScope(1).hideDash();
8686 tryCompare(testCase.previewListView, "open", false);
8787 }
8888
@@ -99,8 +99,8 @@ Item {
9999
100100 function test_changeScope() {
101101 genericScopeView.scope.searchQuery = "test"
102− genericScopeView.scope = scopes.getScope(1)
103102 genericScopeView.scope = scopes.getScope(2)
103+ genericScopeView.scope = scopes.getScope(1)
104104 tryCompare(genericScopeView.scope, "searchQuery", "test")
105105 }
106106