Merge lp:~gary-wzl77/unity-scopes-shell/fix_1576311 into lp:unity-scopes-shell

[Gary.Wang]

Stop typing timer when reset navigation tag(tapping cancel).
Also make sure relevant signal(searchQueryChanged) is triggered to keep query string updated as query string is empty after tapping cancel

Stop typing timer when reset navigation tag(tapping cancel).
Also make sure relevant signal(searchQueryChanged) is triggered to keep query string updated as query string is empty after tapping cancel

[lp:~gary-wzl77/unity-scopes-shell/fix_1576311]

306. By Gary.Wang on 2016-05-04

Only stop typing timer when reset navigation tag(tapping cancel)
Also make sure relevant signal(searchQueryChanged) is triggered to keep query string updated as query string is empty after tapping cancel

[Paweł Stołowski (stolowski)]

Looks good but I still need to test it in the silo. I'm confused by the need of emitting searchQueryChanged() signal though; did you find any issue if this signal is not emitted here? I checked unity8 code and they reset search themseleves before calling resetPrimaryNavigationTag(), so I'm not sure if this signal is really needed?

review: Needs Information

[Gary.Wang (gary-wzl77)]

Actually, we need to trigger this signal.
I take unity-scope-tool for example.
If we don't emit searchQueryChanged() signal in following case
  1.query sth by typing some keywords
  2.click 'Cancel'
The textedit of search query will not be updated, which should be cleared up after a query is cancelled.

[Paweł Stołowski (stolowski)]

> Actually, we need to trigger this signal.
> I take unity-scope-tool for example.
> If we don't emit searchQueryChanged() signal in following case
> 1.query sth by typing some keywords
> 2.click 'Cancel'
> The textedit of search query will not be updated, which should be cleared up
> after a query is cancelled.

Ah, ok, that's interesting. Anyway, this is looking good, no issues spotted in my testing. Thanks!

review: Approve

=== modified file 'src/Unity/scope.cpp'
--- src/Unity/scope.cpp	2016-03-17 22:35:44 +0000
+++ src/Unity/scope.cpp	2016-05-04 09:25:24 +0000
@@ -1278,6 +1278,14 @@
     setCurrentNavigationId("");
     m_filters->update(unity::scopes::FilterState());
     filterStateChanged();
+
+    //1.Do not trigger timeout from m_typingTimer to avoid to execute invalidateResults twice 
+    //after tapping cancel.
+    //2.Also make sure query string signal is triggered as query string is empty.
+    if (m_typingTimer.isActive()) {
+        m_typingTimer.stop();
+        Q_EMIT searchQueryChanged();
+    }  
 }
 
 void Scope::resetFilters()