Merge lp:~mhr3/unity/unity-4.0.fix-856205 into lp:unity/4.0

[Michal Hruby]

Fixes bug #856205. Already approved (and merged) for trunk.

[Mikkel Kamstrup Erlandsen (kamstrup)]

Double checked the code again - still looking good :-)

review: Approve

=== modified file 'plugins/unityshell/src/DashView.cpp'
--- plugins/unityshell/src/DashView.cpp	2011-10-11 17:05:24 +0000
+++ plugins/unityshell/src/DashView.cpp	2011-12-06 11:47:51 +0000
@@ -48,6 +48,9 @@
   : nux::View(NUX_TRACKER_LOCATION)
   , active_lens_view_(0)
   , last_activated_uri_("")
+  , searching_timeout_id_(0)
+  , search_in_progress_(false)
+  , activate_on_finish_(false)
   , visible_(false)
 
 {
@@ -68,6 +71,8 @@
 
 DashView::~DashView()
 {
+  if (searching_timeout_id_)
+    g_source_remove (searching_timeout_id_);
   delete bg_layer_;
   delete bg_darken_layer_;
 }
@@ -648,9 +653,32 @@
   QueueDraw();
 }
 
+gboolean DashView::ResetSearchStateCb(gpointer data)
+{
+  DashView *self = static_cast<DashView*>(data);
+
+  self->search_in_progress_ = false;
+  self->activate_on_finish_ = false;
+  self->searching_timeout_id_ = 0;
+
+  return FALSE;
+}
+
 void DashView::OnSearchChanged(std::string const& search_string)
 {
   LOG_DEBUG(logger) << "Search changed: " << search_string;
+  if (active_lens_view_)
+  {
+    search_in_progress_ = true;
+    // it isn't guaranteed that we get a SearchFinished signal, so we need
+    // to make sure this isn't set even though we aren't doing any search
+    if (searching_timeout_id_)
+    {
+      g_source_remove (searching_timeout_id_);
+    }
+    // 250ms for the Search method call, rest for the actual search
+    searching_timeout_id_ = g_timeout_add (500, &DashView::ResetSearchStateCb, this);
+  }
 }
 
 void DashView::OnLiveSearchReached(std::string const& search_string)
@@ -715,7 +743,12 @@
 void DashView::OnSearchFinished(std::string const& search_string)
 {
   if (search_bar_->search_string == search_string)
+  {
     search_bar_->SearchFinished();
+    search_in_progress_ = false;
+    if (activate_on_finish_)
+      this->OnEntryActivated();
+  }
 }
 
 void DashView::OnGlobalSearchFinished(std::string const& search_string)
@@ -824,7 +857,12 @@
 }
 void DashView::OnEntryActivated()
 {
-  active_lens_view_->ActivateFirst();
+  if (!search_in_progress_)
+  {
+    active_lens_view_->ActivateFirst();
+  }
+  // delay the activation until we get the SearchFinished signal
+  activate_on_finish_ = search_in_progress_;
 }
 
 // Keyboard navigation

=== modified file 'plugins/unityshell/src/DashView.h'
--- plugins/unityshell/src/DashView.h	2011-09-29 11:41:09 +0000
+++ plugins/unityshell/src/DashView.h	2011-12-06 11:47:51 +0000
@@ -104,6 +104,8 @@
 
   nux::Area* KeyNavIteration(nux::KeyNavDirection direction);
 
+  static gboolean ResetSearchStateCb(gpointer data);
+
 private:
   UBusManager ubus_manager_;
   FilesystemLenses lenses_;
@@ -131,6 +133,9 @@
   nux::ObjectPtr <nux::IOpenGLBaseTexture> bg_shine_texture_;
 
   std::string last_activated_uri_;
+  guint searching_timeout_id_;
+  bool search_in_progress_;
+  bool activate_on_finish_;
 
   bool visible_;
 };