Merge lp:~nick-dedekind/unity/smart-scopes.entry-activation into lp:~unity-team/unity/libunity-7.0-breakage

[Nick Dedekind]

If enter is pressed while a search is still being performed, we wait a maximum of one second before activating.

If enter is pressed while a search is still being performed, we wait a maximum of one second before activating.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3141
http://jenkins.qa.ubuntu.com/job/unity-team-unity-libunity-7.0-breakage-ci/82/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-libunity-7.0-breakage-raring-amd64-ci/82

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-team-unity-libunity-7.0-breakage-ci/82/rebuild

review: Approve (continuous-integration)

[Paweł Stołowski (stolowski)]

LGTM and works fine.

review: Approve

=== modified file 'dash/DashView.cpp'
--- dash/DashView.cpp	2013-04-30 23:37:21 +0000
+++ dash/DashView.cpp	2013-05-13 16:04:38 +0000
@@ -57,6 +57,8 @@
 const int GROUP_HEADING_HEIGHT = 24;
 
 const int PREVIEW_ICON_SPLIT_OFFSCREEN_OFFSET = 10;
+
+const int MAX_ENTRY_ACTIVATE_WAIT_TIMEOUT = 1000;
 }
 
 // This is so we can access some protected members in nux::VLayout and
@@ -190,7 +192,7 @@
 }
 
 
-void DashView::OnResultActivated(ResultView::ActivateType type, LocalResult const& local_result, GVariant* data, std::string const& unique_id) 
+void DashView::OnResultActivated(ResultView::ActivateType type, LocalResult const& local_result, GVariant* data, std::string const& unique_id)
 {
   last_activated_result_ = local_result;
   stored_activated_unique_id_ = unique_id;
@@ -226,7 +228,7 @@
 void DashView::BuildPreview(Preview::Ptr model)
 {
   if (!preview_displaying_)
-  {     
+  {
     StartPreviewAnimation();
 
     content_view_->SetPresentRedirectedView(false);
@@ -369,7 +371,7 @@
   });
 
   split_animation_->finished.connect(sigc::mem_fun(this, &DashView::OnPreviewAnimationFinished));
-  split_animation_->Start(); 
+  split_animation_->Start();
 }
 
 void DashView::EndPreviewAnimation()
@@ -474,12 +476,12 @@
 
   /* Give the scopes a chance to prep data before we map them  */
   if (active_scope_view_)
-  { 
+  {
     scope_bar_->Activate(active_scope_view_->scope()->id());
 
     active_scope_view_->SetVisible(true);
     active_scope_view_->scope()->view_type = ScopeViewType::SCOPE_VIEW;
-    
+
     // this will make sure the spinner animates if the search takes a while
     search_bar_->ForceLiveSearch();
   }
@@ -704,7 +706,7 @@
     graphics_engine.PushClippingRectangle(geo_split_clip);
 
     if (preview_scope_view_.IsValid())
-    {    
+    {
       DrawPreviewResultTextures(graphics_engine, force_draw);
     }
 
@@ -923,7 +925,7 @@
 
   std::vector<ResultViewTexture::Ptr> result_textures = preview_scope_view_->GetResultTextureContainers();
   std::vector<ResultViewTexture::Ptr> top_textures;
-  
+
   int height_concat_below = 0;
 
   // int i = 0;
@@ -1063,12 +1065,12 @@
       }
 
       preview_container_->SetPresentRedirectedView(true);
-  
+
       graphics_engine.GetRenderStates().SetBlend(alpha, src, dest);
     }
     else
     {
-      preview_container_->ProcessDraw(graphics_engine, preview_force_draw);        
+      preview_container_->ProcessDraw(graphics_engine, preview_force_draw);
     }
 
     if (preview_force_draw)
@@ -1109,10 +1111,10 @@
   if (visible_ && handled_type == ScopeHandledType::NOT_HANDLED)
   {
     ubus_manager_.SendMessage(UBUS_OVERLAY_CLOSE_REQUEST, NULL,
-                              glib::Source::Priority::HIGH);    
+                              glib::Source::Priority::HIGH);
   }
   else if (!visible_ || handled_type == ScopeHandledType::GOTO_DASH_URI)
-  {    
+  {
     if (!scopes_->GetScope(id))
     {
       // should trigger the addition of the scope.
@@ -1210,7 +1212,8 @@
 
     search_bar_->SetSearchFinished();
     search_in_progress_ = false;
-    
+
+    activate_timeout_.reset();
     if (activate_on_finish_ && !err)
       OnEntryActivated();
     activate_on_finish_= false;
@@ -1350,6 +1353,12 @@
   }
   // delay the activation until we get the SearchFinished signal
   activate_on_finish_ = search_in_progress_;
+
+  activate_timeout_.reset(new glib::Timeout(MAX_ENTRY_ACTIVATE_WAIT_TIMEOUT, [this] {
+    activate_on_finish_ = false;
+    active_scope_view_->ActivateFirst();
+    return FALSE;
+  }));
 }
 
 // Keyboard navigation

=== modified file 'dash/DashView.h'
--- dash/DashView.h	2013-04-17 15:10:39 +0000
+++ dash/DashView.h	2013-05-13 16:04:38 +0000
@@ -162,6 +162,7 @@
   guint64 last_activated_timestamp_;
   bool search_in_progress_;
   bool activate_on_finish_;
+  glib::Source::UniquePtr activate_timeout_;
 
   bool visible_;