git.iko.soy/unity8
on xenial help sign in
Don't reset search string after 2 seconds. Fixes: 1297246
cb489c1Michal Hruby
qml/Dash/GenericScopeView.qml−9
compare with xenial
unifiedsplit
@@ -39,11 +39,8 @@ FocusScope {
39 property bool enableHeightBehaviorOnNextCreation: false
39 property bool enableHeightBehaviorOnNextCreation: false
40 property var categoryView: categoryView
40 property var categoryView: categoryView
41
41
42− // FIXME delay the search so that daemons have time to settle, note that
43− // removing this will break ScopeView::test_changeScope
44 onScopeChanged: {
42 onScopeChanged: {
45 if (scope) {
43 if (scope) {
46− timer.restart();
47 scope.activateApplication.connect(activateApp);
44 scope.activateApplication.connect(activateApp);
48 }
45 }
49 }
46 }
@@ -58,12 +55,6 @@ FocusScope {
58 value: isCurrent && !previewListView.open
55 value: isCurrent && !previewListView.open
59 }
56 }
60
57
61− Timer {
62− id: timer
63− interval: 2000
64− onTriggered: scope.searchQuery = ""
65− }
66−
67 SortFilterProxyModel {
58 SortFilterProxyModel {
68 id: categoryFilter
59 id: categoryFilter
69 model: scope ? scope.categories : null
60 model: scope ? scope.categories : null
tests/qmltests/Dash/tst_GenericScopeView.qml+12−1
@@ -105,11 +105,22 @@ Item {
105 tryCompare(previewListView, "open", false);
105 tryCompare(previewListView, "open", false);
106 }
106 }
107
107
108+ function test_searchQuery() {
109+ genericScopeView.scope = scopes.get(0);
110+ genericScopeView.scope.searchQuery = "test";
111+ genericScopeView.scope = scopes.get(1);
112+ genericScopeView.scope.searchQuery = "test2";
113+ genericScopeView.scope = scopes.get(0);
114+ tryCompare(genericScopeView.scope, "searchQuery", "test");
115+ genericScopeView.scope = scopes.get(1);
116+ tryCompare(genericScopeView.scope, "searchQuery", "test2");
117+ }
118+
108 function test_changeScope() {
119 function test_changeScope() {
109 genericScopeView.scope.searchQuery = "test"
120 genericScopeView.scope.searchQuery = "test"
110 genericScopeView.scope = scopes.get(1)
121 genericScopeView.scope = scopes.get(1)
111 genericScopeView.scope = scopes.get(2)
122 genericScopeView.scope = scopes.get(2)
112− tryCompare(genericScopeView.scope, "searchQuery", "")
123+ tryCompare(genericScopeView.scope, "searchQuery", "test")
113 }
124 }
114
125
115 function test_filter_expand_collapse() {
126 function test_filter_expand_collapse() {