git.iko.soy/unity8
on xenial help sign in
Don't reset search string after 2 seconds. Fixes: 1297246
commitcb489c179fe9deeeb38177c86279d71ec594deb2 authorMichal Hruby <michal.mhr@gmail.com> dateTue 1 Apr 2014, 22:56 (13 years ago) parent2bf8e42d00e551
2 files changed+12−10
compare with xenial
unifiedsplit
qml/Dash/GenericScopeView.qml−9 tests/qmltests/Dash/tst_GenericScopeView.qml+12−1
qml/Dash/GenericScopeView.qml−9
@@ -39,11 +39,8 @@ FocusScope {
3939 property bool enableHeightBehaviorOnNextCreation: false
4040 property var categoryView: categoryView
4141
42− // FIXME delay the search so that daemons have time to settle, note that
43− // removing this will break ScopeView::test_changeScope
4442 onScopeChanged: {
4543 if (scope) {
46− timer.restart();
4744 scope.activateApplication.connect(activateApp);
4845 }
4946 }
@@ -58,12 +55,6 @@ FocusScope {
5855 value: isCurrent && !previewListView.open
5956 }
6057
61− Timer {
62− id: timer
63− interval: 2000
64− onTriggered: scope.searchQuery = ""
65− }
66−
6758 SortFilterProxyModel {
6859 id: categoryFilter
6960 model: scope ? scope.categories : null
tests/qmltests/Dash/tst_GenericScopeView.qml+12−1
@@ -105,11 +105,22 @@ Item {
105105 tryCompare(previewListView, "open", false);
106106 }
107107
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+
108119 function test_changeScope() {
109120 genericScopeView.scope.searchQuery = "test"
110121 genericScopeView.scope = scopes.get(1)
111122 genericScopeView.scope = scopes.get(2)
112− tryCompare(genericScopeView.scope, "searchQuery", "")
123+ tryCompare(genericScopeView.scope, "searchQuery", "test")
113124 }
114125
115126 function test_filter_expand_collapse() {