git.iko.soy/unity8
on xenial help sign in
Activate all results in click scope by default. Fixes: 1341262
e124922Michał Sawicz
qml/Dash/GenericScopeView.qml+1−1
compare with xenial
unifiedsplit
@@ -193,7 +193,7 @@ FocusScope {
193 Connections {
193 Connections {
194 target: rendererLoader.item
194 target: rendererLoader.item
195 onClicked: {
195 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") {
197 // TODO Technically it is possible that calling activate() will make the scope emit
197 // TODO Technically it is possible that calling activate() will make the scope emit
198 // previewRequested so that we show a preview but there's no scope that does that yet
198 // previewRequested so that we show a preview but there's no scope that does that yet
199 // so it's not implemented
199 // so it's not implemented
tests/qmltests/Dash/tst_GenericScopeView.qml+4−4
@@ -56,7 +56,7 @@ Item {
56 property Item previewListView: findChild(genericScopeView, "previewListView")
56 property Item previewListView: findChild(genericScopeView, "previewListView")
57
57
58 function init() {
58 function init() {
59− genericScopeView.scope = scopes.getScope(2)
59+ genericScopeView.scope = scopes.getScope(1)
60 shell.width = units.gu(120)
60 shell.width = units.gu(120)
61 genericScopeView.categoryView.positionAtBeginning();
61 genericScopeView.categoryView.positionAtBeginning();
62 tryCompare(genericScopeView.categoryView, "contentY", 0)
62 tryCompare(genericScopeView.categoryView, "contentY", 0)
@@ -76,13 +76,13 @@ Item {
76
76
77 function test_showDash() {
77 function test_showDash() {
78 testCase.previewListView.open = true;
78 testCase.previewListView.open = true;
79− scopes.getScope(2).showDash();
79+ scopes.getScope(1).showDash();
80 tryCompare(testCase.previewListView, "open", false);
80 tryCompare(testCase.previewListView, "open", false);
81 }
81 }
82
82
83 function test_hideDash() {
83 function test_hideDash() {
84 testCase.previewListView.open = true;
84 testCase.previewListView.open = true;
85− scopes.getScope(2).hideDash();
85+ scopes.getScope(1).hideDash();
86 tryCompare(testCase.previewListView, "open", false);
86 tryCompare(testCase.previewListView, "open", false);
87 }
87 }
88
88
@@ -99,8 +99,8 @@ Item {
99
99
100 function test_changeScope() {
100 function test_changeScope() {
101 genericScopeView.scope.searchQuery = "test"
101 genericScopeView.scope.searchQuery = "test"
102− genericScopeView.scope = scopes.getScope(1)
103 genericScopeView.scope = scopes.getScope(2)
102 genericScopeView.scope = scopes.getScope(2)
103+ genericScopeView.scope = scopes.getScope(1)
104 tryCompare(genericScopeView.scope, "searchQuery", "test")
104 tryCompare(genericScopeView.scope, "searchQuery", "test")
105 }
105 }
106
106