Merge lp:~nick-dedekind/unity/lp1043808.instant-preview-feedback into lp:unity

[Nick Dedekind]

Immediate feedback for dash preview activation.

Preview of dash results immediately open preview window, and show spinner if the preview result takes longer than 300ms to arrive. Preview state machine now keeps track of preview position between preview activations. Fixes problem with preview response lag causing current index corruption.

[Brandon Schaefer (brandontschaefer)]

Confirmed working, and looks good to me.

I think at lease a manual test should be added to show that the spinner shows when right clicking a shopping lens results.

review: Approve

[Michal Hruby (mhr3)]

66 + glib::Variant data(g_variant_new("(iiii)", row_y, row_height, left_results, right_results), glib::StealRef());
407 + glib::Variant data(g_variant_new("(iiii)", row_y, row_height, left_results, right_results), glib::StealRef());

The StealRef() here doesn't look right, g_variant_new returns a floating ref, so the Variant wrapper should sink it first (which it doesn't with StealRef).

review: Needs Fixing

[Nick Dedekind (nick-dedekind)]

Fixed glib variant reference.

All types of result activation now include additional URI info so that lenses can activate previews from direct activations.

[Nick Dedekind (nick-dedekind)]

Added manual test.

[Gord Allott (gordallott)]

Code looks fine, we should probably rearchtect this system sometime though, its doing things it wasn't designed to do as it was built before we really knew what the design was.

review: Approve

=== modified file 'dash/CoverflowResultView.cpp'
--- dash/CoverflowResultView.cpp	2012-09-18 11:55:33 +0000
+++ dash/CoverflowResultView.cpp	2012-09-27 16:36:23 +0000
@@ -18,6 +18,7 @@
  */
 
 #include "CoverflowResultView.h"
+#include <UnityCore/Variant.h>
 #include "unity-shared/IconLoader.h"
 #include "unity-shared/IconTexture.h"
 #include "unity-shared/DashStyle.h"
@@ -124,18 +125,18 @@
 
 void CoverflowResultItem::Activate(int button)
 {
+  int index = Index();
+  int size = model_->Items().size();
+
+  glib::Variant data(g_variant_new("(iiii)", 0, 0, index, size - index));
+
   //Left and right click take you to previews.
   if (button == 1 || button == 3)
-    parent_->UriActivated.emit(result_.uri, ResultView::ActivateType::PREVIEW);
+    parent_->Activate(result_.uri, index, ResultView::ActivateType::PREVIEW);
   //Scroll click opens up music player.
   else if (button == 2)
-    parent_->UriActivated.emit(result_.uri, ResultView::ActivateType::DIRECT);
-
-  int index = Index();
-  int size = model_->Items().size();
-
-  ubus_.SendMessage(UBUS_DASH_PREVIEW_INFO_PAYLOAD, 
-                    g_variant_new("(iiii)", 0, 0, index, size - index));
+    parent_->Activate(result_.uri, index, ResultView::ActivateType::DIRECT);
+
 }
 
 CoverflowResultView::Impl::Impl(CoverflowResultView *parent)
@@ -189,11 +190,8 @@
     
     if (nav_mode)
     {
-      int left_results = current_index;
-      int right_results = num_results ? (num_results - current_index) - 1 : 0;
-      parent_->UriActivated.emit(GetUriForIndex(current_index), ActivateType::PREVIEW);
-      ubus_.SendMessage(UBUS_DASH_PREVIEW_INFO_PAYLOAD, 
-                              g_variant_new("(iiii)", 0, 0, left_results, right_results));
+      std::string uri = GetUriForIndex(current_index);
+      parent_->Activate(uri, current_index, ActivateType::PREVIEW);
     }
   });
 }
@@ -309,5 +307,19 @@
 }
 
 
+void CoverflowResultView::Activate(std::string const& uri, int index, ResultView::ActivateType type)
+{
+  unsigned num_results = pimpl->coverflow_->model()->Items().size();
+
+  int left_results = index;
+  int right_results = num_results ? (num_results - index) - 1 : 0;
+  int row_y = GetRootGeometry().y;
+  int row_height = renderer_->height;
+
+  glib::Variant data(g_variant_new("(iiii)", row_y, row_height, left_results, right_results));
+  UriActivated.emit(uri, type, data);
+}
+
+
 }
 }

=== modified file 'dash/CoverflowResultView.h'
--- dash/CoverflowResultView.h	2012-08-20 19:28:46 +0000
+++ dash/CoverflowResultView.h	2012-09-27 16:36:23 +0000
@@ -39,12 +39,15 @@
 
   virtual void AddResult(Result& result);
   virtual void RemoveResult(Result& result);
+  
+  virtual void Activate(std::string const& uri, int index, ActivateType type);
 
 protected:
   virtual void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);
   virtual void DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw);
   virtual long ComputeContentSize();
 
+
 private:
   struct Impl;
   Impl* pimpl;

=== modified file 'dash/DashController.cpp'
--- dash/DashController.cpp	2012-09-20 10:18:18 +0000
+++ dash/DashController.cpp	2012-09-27 16:36:23 +0000
@@ -228,7 +228,6 @@
   if (check_monitor)
   {
     monitor_ = CLAMP(GetIdealMonitor(), 0, static_cast<int>(UScreen::GetDefault()->GetMonitors().size()-1));
-    printf("relayout on monitor:%d, monitor count:%d\n", monitor_, static_cast<int>(UScreen::GetDefault()->GetMonitors().size()));
   }
 
   nux::Geometry geo = GetIdealWindowGeometry();

=== modified file 'dash/DashView.cpp'
--- dash/DashView.cpp	2012-09-20 10:18:18 +0000
+++ dash/DashView.cpp	2012-09-27 16:36:23 +0000
@@ -165,6 +165,7 @@
     animation_.Start();
   }
 
+  preview_navigation_mode_ = previews::Navigation::NONE;
   preview_displaying_ = false;
 
   // re-focus dash view component.
@@ -201,6 +202,39 @@
   }
 }
 
+void DashView::OnUriActivated(ResultView::ActivateType type, std::string const& uri, GVariant* data, std::string const& unique_id) 
+{
+  last_activated_uri_ = uri;
+  stored_activated_unique_id_ = unique_id;
+
+  if (data)
+  {
+    // Update positioning information.
+    int position = -1;
+    int row_height = 0;
+    int results_to_the_left = 0;
+    int results_to_the_right = 0;
+    g_variant_get(data, "(iiii)", &position, &row_height, &results_to_the_left, &results_to_the_right);
+    preview_state_machine_.SetSplitPosition(SplitPosition::CONTENT_AREA, position);
+    preview_state_machine_.left_results = results_to_the_left;
+    preview_state_machine_.right_results = results_to_the_right;
+
+    if (opening_row_y_ == -1)
+    {
+      // Update only when opening the previews
+      opening_row_y_ = position;
+    }
+    opening_row_height_ = row_height;
+  }
+
+  // we want immediate preview reaction on first opening.
+  if (type == ResultView::ActivateType::DIRECT && !preview_displaying_)
+  {
+    BuildPreview(Preview::Ptr(nullptr));
+  }
+}
+
+
 void DashView::BuildPreview(Preview::Ptr model)
 {
   if (!preview_displaying_)
@@ -239,21 +273,19 @@
  
     // connect to nav left/right signals to request nav left/right movement.
     preview_container_->navigate_left.connect([&] () {
-      preview_state_machine_.Reset();
       preview_navigation_mode_ = previews::Navigation::LEFT;
 
       // sends a message to all result views, sending the the uri of the current preview result
       // and the unique id of the result view that should be handling the results
-      ubus_manager_.SendMessage(UBUS_DASH_PREVIEW_NAVIGATION_REQUEST, g_variant_new("(iss)", -1, stored_preview_uri_identifier_.c_str(), stored_preview_unique_id_.c_str()));
+      ubus_manager_.SendMessage(UBUS_DASH_PREVIEW_NAVIGATION_REQUEST, g_variant_new("(iss)", -1, last_activated_uri_.c_str(), stored_activated_unique_id_.c_str()));
     });
 
     preview_container_->navigate_right.connect([&] () {
-      preview_state_machine_.Reset();
       preview_navigation_mode_ = previews::Navigation::RIGHT;
       
       // sends a message to all result views, sending the the uri of the current preview result
       // and the unique id of the result view that should be handling the results
-      ubus_manager_.SendMessage(UBUS_DASH_PREVIEW_NAVIGATION_REQUEST, g_variant_new("(iss)", 1, stored_preview_uri_identifier_.c_str(), stored_preview_unique_id_.c_str()));
+      ubus_manager_.SendMessage(UBUS_DASH_PREVIEW_NAVIGATION_REQUEST, g_variant_new("(iss)", 1, last_activated_uri_.c_str(), stored_activated_unique_id_.c_str()));
     });
 
     preview_container_->request_close.connect([&] () { ClosePreview(); });
@@ -372,11 +404,7 @@
   content_layout_->AddView(lenses_layout_, 1, nux::MINOR_POSITION_LEFT);
 
   home_view_ = new LensView(home_lens_, nullptr);
-  home_view_->uri_preview_activated.connect([&] (std::string const& uri, std::string const& unique_id) 
-  {
-    stored_preview_unique_id_ = unique_id;
-    stored_preview_uri_identifier_ = uri;
-  });
+  home_view_->uri_activated.connect(sigc::mem_fun(this, &DashView::OnUriActivated));
 
   AddChild(home_view_);
   active_lens_view_ = home_view_;
@@ -393,26 +421,6 @@
 {
   ubus_manager_.RegisterInterest(UBUS_PLACE_ENTRY_ACTIVATE_REQUEST,
       sigc::mem_fun(this, &DashView::OnActivateRequest));
-
-  ubus_manager_.RegisterInterest(UBUS_DASH_PREVIEW_INFO_PAYLOAD, [&] (GVariant *data) 
-  {
-    int position = -1;
-    int row_height = 0;
-    int results_to_the_left = 0;
-    int results_to_the_right = 0;
-    g_variant_get(data, "(iiii)", &position, &row_height, &results_to_the_left, &results_to_the_right);
-    preview_state_machine_.SetSplitPosition(SplitPosition::CONTENT_AREA, position);
-    preview_state_machine_.left_results = results_to_the_left;
-    preview_state_machine_.right_results = results_to_the_right;
-
-    if (opening_row_y_ == -1)
-    {
-      // Update only when opening the previews
-      opening_row_y_ = position;
-    }
-    opening_row_height_ = row_height;
-
-  });
 }
 
 long DashView::PostLayoutManagement (long LayoutResult)
@@ -891,12 +899,6 @@
   AddChild(view);
   view->SetVisible(false);
   view->uri_activated.connect(sigc::mem_fun(this, &DashView::OnUriActivated));
-  view->uri_preview_activated.connect([&] (std::string const& uri, std::string const& unique_id) 
-  {
-    LOG_DEBUG(logger) << "got unique id from preview activation: " << unique_id;
-    stored_preview_unique_id_ = unique_id;
-    stored_preview_uri_identifier_ = uri;
-  });
 
   lenses_layout_->AddView(view, 1);
   lens_views_[lens->id] = view;
@@ -1016,11 +1018,6 @@
   }
 }
 
-void DashView::OnUriActivated(std::string const& uri)
-{
-  last_activated_uri_ = uri;
-}
-
 void DashView::OnUriActivatedReply(std::string const& uri, HandledType type, Lens::Hints const&)
 {
   // We don't want to close the dash if there was another activation pending

=== modified file 'dash/DashView.h'
--- dash/DashView.h	2012-09-19 13:58:01 +0000
+++ dash/DashView.h	2012-09-27 16:36:23 +0000
@@ -93,7 +93,7 @@
   void DrawContent(nux::GraphicsEngine& gfx_context, bool force_draw);
   virtual long PostLayoutManagement (long LayoutResult);
   nux::Area* FindAreaUnderMouse(const nux::Point& mouse_position, nux::NuxEventType event_type);
-  
+
   void BuildPreview(Preview::Ptr model);
   void OnMouseButtonDown(int x, int y, unsigned long button, unsigned long key);
   void OnBackgroundColorChanged(GVariant* args);
@@ -104,7 +104,7 @@
   void OnSearchFinished(Lens::Hints const& hints);
   void OnGlobalSearchFinished(Lens::Hints const& hints);
   void OnAppsGlobalSearchFinished(Lens::Hints const& hints);
-  void OnUriActivated(std::string const& uri);
+  void OnUriActivated(ResultView::ActivateType type, std::string const& uri, GVariant* data, std::string const& unique_id);
   void OnUriActivatedReply(std::string const& uri, HandledType type, Lens::Hints const&);
   bool DoFallbackActivation(std::string const& uri);
   bool LaunchApp(std::string const& appname);
@@ -130,8 +130,7 @@
   PreviewStateMachine preview_state_machine_;
   previews::PreviewContainer::Ptr preview_container_;
   bool preview_displaying_;
-  std::string stored_preview_unique_id_;
-  std::string stored_preview_uri_identifier_;
+  std::string stored_activated_unique_id_;
   dash::previews::Navigation preview_navigation_mode_;
 
   nux::VLayout* layout_;

=== modified file 'dash/LensView.cpp'
--- dash/LensView.cpp	2012-09-19 18:45:56 +0000
+++ dash/LensView.cpp	2012-09-27 16:36:23 +0000
@@ -344,18 +344,17 @@
   grid->expanded = false;
 
   group->SetRendererName(renderer_name.c_str());
-  grid->UriActivated.connect(sigc::bind([&] (std::string const& uri, ResultView::ActivateType type, std::string const& view_id) 
+  grid->UriActivated.connect(sigc::bind([&] (std::string const& uri, ResultView::ActivateType type, GVariant* data, std::string const& view_id) 
   {
+    uri_activated.emit(type, uri, data, view_id); 
     switch (type)
     {
       case ResultView::ActivateType::DIRECT:
       {
-        uri_activated.emit(uri); 
         lens_->Activate(uri);  
       } break;
       case ResultView::ActivateType::PREVIEW:
       {
-        uri_preview_activated.emit(uri, view_id);
         lens_->Preview(uri);
       } break;
       default: break;
@@ -452,6 +451,13 @@
   return static_cast<ResultViewGrid*>(group->GetChildView());
 }
 
+ResultView* LensView::GetResultViewForCategory(unsigned category_index)
+{
+  if (category_index >= categories_.size()) return nullptr;
+  PlacesGroup* group = categories_.at(category_index);
+  return static_cast<ResultView*>(group->GetChildView());
+}
+
 void LensView::OnResultAdded(Result const& result)
 {
   try {
@@ -720,22 +726,22 @@
     for (unsigned int i = 0; i < category_order.size(); i++)
     {
       unsigned cat_index = category_order.at(i);
-      ResultViewGrid* grid = GetGridForCategory(cat_index);
-      if (grid == nullptr) continue;
-      auto it = grid->GetIteratorAtRow(0);
+      ResultView* result_view = GetResultViewForCategory(cat_index);
+      if (result_view == nullptr) continue;
+      auto it = result_view->GetIteratorAtRow(0);
       if (!it.IsLast())
       {
         Result result(*it);
-        uri_activated(result.uri);
-        lens_->Activate(result.uri);
+        result_view->Activate(result.uri, result_view->GetIndexForUri(result.uri), ResultView::ActivateType::DIRECT);
         return;
       }
     }
+
     // Fallback
     Result result = results->RowAtIndex(0);
     if (result.uri != "")
     {
-      uri_activated(result.uri);
+      uri_activated.emit(ResultView::ActivateType::DIRECT, result.uri, nullptr, "");
       lens_->Activate(result.uri);
     }
   }

=== modified file 'dash/LensView.h'
--- dash/LensView.h	2012-09-19 18:45:56 +0000
+++ dash/LensView.h	2012-09-27 16:36:23 +0000
@@ -68,8 +68,7 @@
   nux::Property<ViewType> view_type;
   nux::Property<bool> can_refine_search;
 
-  sigc::signal<void, std::string const&> uri_activated;
-  sigc::signal<void, std::string const&, std::string const&> uri_preview_activated;
+  sigc::signal<void, ResultView::ActivateType, std::string const&, GVariant*, std::string const&> uri_activated;
 
   void PerformSearch(std::string const& search_query);
   void CheckNoResults(Lens::Hints const& hints);
@@ -95,6 +94,7 @@
   void OnViewTypeChanged(ViewType view_type);
   bool ReinitializeFilterModels();
   ResultViewGrid* GetGridForCategory(unsigned category_index);
+  ResultView* GetResultViewForCategory(unsigned category_index);
 
   void BuildPreview(std::string const& uri, Preview::Ptr model);
 

=== modified file 'dash/PreviewStateMachine.cpp'
--- dash/PreviewStateMachine.cpp	2012-08-15 09:54:22 +0000
+++ dash/PreviewStateMachine.cpp	2012-09-27 16:36:23 +0000
@@ -51,8 +51,6 @@
 {
   stored_preview_ = preview;
   CheckPreviewRequirementsFulfilled();
-  left_results = -1;
-  right_results = -1;
   requires_activation_ = true;
 }
 
@@ -66,8 +64,7 @@
 
 void PreviewStateMachine::ClosePreview()
 {
-  stored_preview_ = nullptr;
-  preview_active = true;
+  Reset();
   SetSplitPosition(SplitPosition::CONTENT_AREA, -1); 
 }
 

=== modified file 'dash/ResultView.cpp'
--- dash/ResultView.cpp	2012-09-02 20:34:37 +0000
+++ dash/ResultView.cpp	2012-09-27 16:36:23 +0000
@@ -28,6 +28,7 @@
 #include <Nux/VLayout.h>
 #include <Nux/Button.h>
 #include <NuxCore/Logger.h>
+#include <UnityCore/Variant.h>
 
 namespace unity
 {

=== modified file 'dash/ResultView.h'
--- dash/ResultView.h	2012-09-02 20:34:37 +0000
+++ dash/ResultView.h	2012-09-27 16:36:23 +0000
@@ -61,13 +61,15 @@
   nux::Property<bool> expanded;
   nux::Property<int> results_per_row;
   nux::Property<std::string> unique_id;  
-  sigc::signal<void, std::string const&, ActivateType> UriActivated;
+  sigc::signal<void, std::string const&, ActivateType, GVariant*> UriActivated;
 
   std::string GetName() const;
   ResultIterator GetIteratorAtRow(unsigned row);
   void AddProperties(GVariantBuilder* builder);
   IntrospectableList GetIntrospectableChildren();
 
+  virtual void Activate(std::string const& uri, int index, ActivateType type) = 0;
+
 protected:
   virtual void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);
   virtual void DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw);

=== modified file 'dash/ResultViewGrid.cpp'
--- dash/ResultViewGrid.cpp	2012-09-24 16:47:33 +0000
+++ dash/ResultViewGrid.cpp	2012-09-27 16:36:23 +0000
@@ -28,6 +28,7 @@
 #include <gdk/gdk.h>
 #include <unity-protocol.h>
 
+#include <UnityCore/Variant.h>
 #include "unity-shared/IntrospectableWrappers.h"
 #include "unity-shared/Timer.h"
 #include "unity-shared/ubus-server.h"
@@ -75,7 +76,7 @@
   key_nav_focus_change.connect(sigc::mem_fun(this, &ResultViewGrid::OnKeyNavFocusChange));
   key_nav_focus_activate.connect([&] (nux::Area *area) 
   { 
-    UriActivated.emit (focused_uri_, ResultView::ActivateType::DIRECT); 
+    Activate(focused_uri_, selected_index_, ResultView::ActivateType::DIRECT);
   });
   key_down.connect(sigc::mem_fun(this, &ResultViewGrid::OnKeyDown));
   mouse_move.connect(sigc::mem_fun(this, &ResultViewGrid::MouseMove));
@@ -140,30 +141,9 @@
       {
         activated_uri_ = GetUriForIndex(current_index);
         LOG_DEBUG(logger) << "activating preview for index: " 
-                          << "(" << current_index << ")"
-                          << " " << activated_uri_;
-        int left_results = current_index;
-        int right_results = num_results ? (num_results - current_index) - 1 : 0;
-
-        int row_y = padding + GetRootGeometry().y;
-        int row_size = renderer_->height + vertical_spacing;
-        int row_height = row_size;
-
-        if (GetItemsPerRow())
-        {
-          int num_row = GetNumResults() / GetItemsPerRow();
-          if (GetNumResults() % GetItemsPerRow())
-          {
-            ++num_row;
-          }
-          int row_index = current_index / GetItemsPerRow();
-
-          row_y += row_index * row_size;
-        }
-        
-        ubus_.SendMessage(UBUS_DASH_PREVIEW_INFO_PAYLOAD, 
-                                g_variant_new("(iiii)", row_y, row_height, left_results, right_results));
-        UriActivated.emit(activated_uri_, ActivateType::PREVIEW);
+                  << "(" << current_index << ")"
+                  << " " << activated_uri_;
+        Activate(activated_uri_, current_index, ActivateType::PREVIEW);
       }
 
     }
@@ -176,6 +156,33 @@
   SetDndEnabled(true, false);
 }
 
+void ResultViewGrid::Activate(std::string const& uri, int index, ResultView::ActivateType type)
+{
+  unsigned num_results = GetNumResults();
+
+  int left_results = index;
+  int right_results = num_results ? (num_results - index) - 1 : 0;
+  //FIXME - just uses y right now, needs to use the absolute position of the bottom of the result 
+  // (jay) Here is the fix: Compute the y position of the row where the item is located.
+  int row_y = padding + GetRootGeometry().y;
+  int row_height = renderer_->height + vertical_spacing;
+
+  if (GetItemsPerRow())
+  {
+    int num_row = GetNumResults() / GetItemsPerRow();
+    if (GetNumResults() % GetItemsPerRow())
+    {
+      ++num_row;
+    }
+    int row_index = index / GetItemsPerRow();
+
+    row_y += row_index * row_height;
+  }
+
+  glib::Variant data(g_variant_new("(iiii)", row_y, row_height, left_results, right_results));
+  UriActivated.emit(uri, type, data);
+}
+
 void ResultViewGrid::QueueLazyLoad()
 {
   lazy_load_source_.reset(new glib::Idle(glib::Source::Priority::DEFAULT));
@@ -483,12 +490,7 @@
 
   if (event_type == nux::NUX_KEYDOWN && event_keysym == XK_Menu)
   {
-    UriActivated.emit (focused_uri_, ResultView::ActivateType::PREVIEW);
-    int left_results = selected_index_;
-    int right_results = (num_results - selected_index_) - 1;
-    //FIXME - just uses y right now, needs to use the absolute position of the bottom of the result 
-    ubus_.SendMessage(UBUS_DASH_PREVIEW_INFO_PAYLOAD, 
-                              g_variant_new("(iii)", mouse_last_y_, left_results, right_results)); 
+    Activate(focused_uri_, selected_index_, ActivateType::PREVIEW);
   }
 }
 
@@ -715,36 +717,12 @@
     Result result = *it;
     selected_index_ = index;
     focused_uri_ = result.uri;
-    if (nux::GetEventButton(button_flags) == nux::MouseButton::MOUSE_BUTTON3)
-    {
-      activated_uri_ = result.uri();
-      UriActivated.emit(result.uri, ResultView::ActivateType::PREVIEW);
-      int left_results = index;
-      int right_results = (num_results - index) - 1;
-      //FIXME - just uses y right now, needs to use the absolute position of the bottom of the result 
-      // (jay) Here is the fix: Compute the y position of the row where the item is located.
-      int row_y = padding + GetRootGeometry().y;
-      int row_size = renderer_->height + vertical_spacing;
-      int row_height = row_size;
-
-      if (GetItemsPerRow())
-      {
-        int num_row = GetNumResults() / GetItemsPerRow();
-        if (GetNumResults() % GetItemsPerRow())
-        {
-          ++num_row;
-        }
-        int row_index = index / GetItemsPerRow();
-
-        row_y += row_index * row_size;
-      }
-      ubus_.SendMessage(UBUS_DASH_PREVIEW_INFO_PAYLOAD, 
-                                g_variant_new("(iiii)", row_y, row_height, left_results, right_results));
-    }
-    else
-    {
-      UriActivated.emit(result.uri, ResultView::ActivateType::DIRECT);
-    }
+
+    ActivateType type = nux::GetEventButton(button_flags) == nux::MouseButton::MOUSE_BUTTON3 ?  ResultView::ActivateType::PREVIEW :
+                                                                                                ResultView::ActivateType::DIRECT;
+
+    activated_uri_ = result.uri();
+    Activate(activated_uri_, index, type);
   }
 }
 

=== modified file 'dash/ResultViewGrid.h'
--- dash/ResultViewGrid.h	2012-09-17 12:16:29 +0000
+++ dash/ResultViewGrid.h	2012-09-27 16:36:23 +0000
@@ -52,6 +52,8 @@
 
   int GetSelectedIndex();
   virtual unsigned GetIndexAtPosition(int x, int y);
+  
+  virtual void Activate(std::string const& uri, int index, ActivateType type);
 
 protected:
   void MouseMove(int x, int y, int dx, int dy, unsigned long button_flags, unsigned long key_flags);

=== modified file 'dash/previews/PreviewContainer.cpp'
--- dash/previews/PreviewContainer.cpp	2012-09-19 14:40:41 +0000
+++ dash/previews/PreviewContainer.cpp	2012-09-27 16:36:23 +0000
@@ -47,11 +47,8 @@
 {
 nux::logging::Logger logger("unity.dash.previews.previewcontainer");
 
-
-
-const int ANIM_DURATION_SHORT_SHORT = 100;
-const int ANIM_DURATION = 200;
 const int ANIM_DURATION_LONG = 500;
+const int PREVIEW_SPINNER_WAIT = 300;
 
 const std::string ANIMATION_IDLE = "animation-idle";
 }
@@ -99,11 +96,10 @@
 
   void PushPreview(previews::Preview::Ptr preview, Navigation direction)
   {
-    preview_initiate_count_++;
-    StopPreviewWait();
-
     if (preview)
     {
+      preview_initiate_count_++;
+      StopPreviewWait();
       // the parents layout will not change based on the previews.
       preview->SetReconfigureParentLayoutOnGeometryChange(false);
       
@@ -111,6 +107,11 @@
       AddView(preview.GetPointer());
       preview->SetVisible(false);
     }
+    else
+    {
+      // if we push a null preview, then start waiting.
+      StartPreviewWait();      
+    }
     PreviewSwipe swipe;
     swipe.direction = direction;
     swipe.preview = preview;
@@ -227,7 +228,7 @@
 
   void StartPreviewWait()
   {
-    preview_wait_timer_.reset(new glib::Timeout(300, [&] () {
+    preview_wait_timer_.reset(new glib::Timeout(PREVIEW_SPINNER_WAIT, [&] () {
 
       if (waiting_preview_)
         return false;

=== modified file 'manual-tests/Preview.txt'
--- manual-tests/Preview.txt	2012-09-19 17:49:17 +0000
+++ manual-tests/Preview.txt	2012-09-27 16:36:23 +0000
@@ -170,3 +170,20 @@
 Expected Result:
   The button A must not be highlighted.
   The button B must be highlighted.
+
+
+Preview Open Wait
+------------------------------
+This tests that if a preview takes time to open, the preview will open with a spinner
+while it waits for the preview info to return to unity.
+
+Setup:
+#. Open dash.
+#. Open Application Lens.
+
+Actions:
+#. Right-click an arbitrary result
+
+Expected Result:
+  The preview window will immediately display, and if the preview takes longer 
+  than 300ms to open, it will display a spinner while waiting.

=== modified file 'unity-shared/UBusMessages.h'
--- unity-shared/UBusMessages.h	2012-09-18 13:59:06 +0000
+++ unity-shared/UBusMessages.h	2012-09-27 16:36:23 +0000
@@ -82,10 +82,6 @@
 // FIXME - fix the nux focus api so we don't need this
 #define UBUS_RESULT_VIEW_KEYNAV_CHANGED "RESULT_VIEW_KEYNAV_CHANGED"
 
-// for communicating positions to the preview state machine (iiii)
-// (split y coord in absolute geometry, height of row where icon resides, results to the left, results to the right)
-#define UBUS_DASH_PREVIEW_INFO_PAYLOAD "DASH_PREVIEW_INFO_PAYLOAD"
-
 // called when previews wish to navigate left/right or close (is)
 // -1 = left, 0 = close, 1 = right, 
 // string is the uri string that last result activated was