Merge lp:~mhr3/unity/fix-987781 into lp:unity

[Michal Hruby]

Make sure hud's spinner stops spinning after hud service returns reply

Hud's spinner keeps spinning even after the service returns reply.

Call SearchBar's SearchFinished() to signal it to stop spinning. Also get rid of some code from HudView that SearchBar handles internally. This makes it more consistent to the way it's used in DashView and therefore easier to maintain.

No new tests.

[Marco Trevisan (Treviño) (3v1n0)]

LGTM.

review: Approve

[Gord Allott (gordallott)]

review: Approve

=== modified file 'plugins/unityshell/src/HudController.cpp'
--- plugins/unityshell/src/HudController.cpp	2012-04-23 00:24:52 +0000
+++ plugins/unityshell/src/HudController.cpp	2012-04-24 11:41:26 +0000
@@ -467,22 +467,12 @@
 
 void Controller::OnSearchChanged(std::string search_string)
 {
-  //FIXME!! - when the service is smart enough to not fall over if you send many requests, this should be removed
+  // we're using live_search_reached, so this is called 40ms after the text
+  // is input in the search bar
   LOG_DEBUG(logger) << "Search Changed";
-  auto on_search_changed_timeout_lambda = [] (gpointer data) -> gboolean {
-    Controller* self = static_cast<Controller*>(data);
-    self->hud_service_.RequestQuery(self->last_search_);
-    self->type_wait_handle_ = 0;
-    return FALSE;
-  };
-  
+
   last_search_ = search_string;
-  
-  if (type_wait_handle_)
-  {
-    g_source_remove(type_wait_handle_);
-  }  
-  type_wait_handle_ = g_timeout_add(100, on_search_changed_timeout_lambda, this);
+  hud_service_.RequestQuery(last_search_);
 }
 
 void Controller::OnSearchActivated(std::string search_string)
@@ -520,6 +510,7 @@
   }
 
   SetIcon(icon_name);
+  view_->SearchFinished();
 }
 
 // Introspectable

=== modified file 'plugins/unityshell/src/HudView.cpp'
--- plugins/unityshell/src/HudView.cpp	2012-04-23 02:03:25 +0000
+++ plugins/unityshell/src/HudView.cpp	2012-04-24 11:41:26 +0000
@@ -371,7 +371,7 @@
       search_bar_->SetMinimumHeight(style.GetSearchBarHeight());
       search_bar_->SetMaximumHeight(style.GetSearchBarHeight());
       search_bar_->search_hint = _("Type your command");
-      search_bar_->search_changed.connect(sigc::mem_fun(this, &View::OnSearchChanged));
+      search_bar_->live_search_reached.connect(sigc::mem_fun(this, &View::OnSearchChanged));
       AddChild(search_bar_.GetPointer());
       content_layout_->AddView(search_bar_.GetPointer(), 0, nux::MINOR_POSITION_LEFT);
 
@@ -392,14 +392,6 @@
 {
   LOG_DEBUG(logger) << "got search change";
   search_changed.emit(search_string);
-  if (search_string.empty())
-  {
-    search_bar_->search_hint = _("Type your command");
-  }
-  else
-  {
-    search_bar_->search_hint = "";
-  }
 
   std::list<HudButton::Ptr>::iterator it;
   for(it = buttons_.begin(); it != buttons_.end(); ++it)
@@ -511,13 +503,17 @@
     else
     {
       search_bar_->search_string = "";
-      search_bar_->search_hint = _("Type your command");
     }
     return true;
   }
   return false;
 }
 
+void View::SearchFinished()
+{
+  search_bar_->SearchFinished();
+}
+
 void View::OnSearchbarActivated()
 {
   // The "Enter" key has been received and the text entry has the key focus.
@@ -581,13 +577,11 @@
 
     if (search_bar_->search_string == "")
     {
-      search_bar_->search_hint = _("Type your command");
       ubus.SendMessage(UBUS_HUD_CLOSE_REQUEST);
     }
     else
     {
       search_bar_->search_string = "";
-      search_bar_->search_hint = _("Type your command");
       return search_bar_->text_entry();
     }
     return NULL;

=== modified file 'plugins/unityshell/src/HudView.h'
--- plugins/unityshell/src/HudView.h	2012-04-22 19:09:00 +0000
+++ plugins/unityshell/src/HudView.h	2012-04-24 11:41:26 +0000
@@ -55,6 +55,7 @@
   void SetQueries(Hud::Queries queries);
   void SetIcon(std::string icon_name, unsigned int tile_size, unsigned int size, unsigned int padding);
   void ShowEmbeddedIcon(bool show);
+  void SearchFinished();
 
   void AboutToShow();
   void AboutToHide();