Merge lp:~3v1n0/unity/dash-prompt-app-activation into lp:unity

[Marco Trevisan (Treviño)]

ResultViewGrid: wait for double-click event only if the relative result needs the Preview

This was causing a 500ms delay between the user click and some results (apps) activation.
Also, at this point, we can get rid of PREVIEW_LEFT_BUTTON activation type.

Remove the annoying delay before launching an application using mouse clicks in dash.

This is a regression we've introduced looong time ago, and really needs to be fixed.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3960
http://jenkins.qa.ubuntu.com/job/unity-ci/1201/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-amd64-ci/89
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-armhf-ci/88
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-vivid-i386-ci/88/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1201/rebuild

review: Needs Fixing (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

LGTM

review: Approve

[Christopher Townsend (townsend)]

Yeah, very nice! No more 1 second(!) delay when trying to start an app after opening the Dash. I'll wait for Jenkins to ack/nack before top approving.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3964
http://jenkins.qa.ubuntu.com/job/unity-ci/1206/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-amd64-ci/94
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-armhf-ci/93
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-vivid-i386-ci/94/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1206/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3964
http://jenkins.qa.ubuntu.com/job/unity-ci/1225/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-armhf-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-i386-ci/1

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1225/rebuild

review: Approve (continuous-integration)

=== modified file 'dash/DashController.h'
--- dash/DashController.h	2014-04-25 02:42:01 +0000
+++ dash/DashController.h	2015-04-24 13:00:45 +0000
@@ -21,7 +21,6 @@
 
 #include <memory>
 
-#include <gdk/gdk.h>
 #include <UnityCore/ConnectionManager.h>
 #include <UnityCore/GLibDBusServer.h>
 #include <UnityCore/GLibSignal.h>
 
=== modified file 'dash/DashView.cpp'
--- dash/DashView.cpp	2015-03-20 18:03:15 +0000
+++ dash/DashView.cpp	2015-04-24 13:00:45 +0000
@@ -59,7 +59,7 @@
 const RawPixel PREVIEW_CONTAINER_TRIANGLE_WIDTH = 14_em;
 const RawPixel PREVIEW_CONTAINER_TRIANGLE_HEIGHT = 12_em;
 
-const int MAX_ENTRY_ACTIVATE_WAIT_TIMEOUT = 1000;
+const int MAX_ENTRY_ACTIVATE_WAIT_TIMEOUT = 300;
 }
 
 // This is so we can access some protected members in nux::VLayout and
@@ -120,7 +120,6 @@
   , preview_displaying_(false)
   , preview_navigation_mode_(previews::Navigation::NONE)
   , last_activated_timestamp_(0)
-  , search_in_progress_(false)
   , activate_on_finish_(false)
   , visible_(false)
   , opening_column_x_(-1)
@@ -1221,21 +1220,27 @@
 
 void DashView::OnSearchChanged(std::string const& search_string)
 {
-  search_in_progress_ = true;
+  activate_on_finish_ = false;
 }
 
 void DashView::OnLiveSearchReached(std::string const& search_string)
 {
-  // reset and set it again once we're sure a search is happening
-  search_in_progress_ = false;
-
   LOG_DEBUG(logger) << "Live search reached: " << search_string;
-  if (active_scope_view_)
+  if (!active_scope_view_.IsValid())
+    return;
+
+  if (active_scope_view_->PerformSearch(search_string, sigc::mem_fun(this, &DashView::OnScopeSearchFinished)))
   {
-    if (active_scope_view_->PerformSearch(search_string, sigc::mem_fun(this, &DashView::OnScopeSearchFinished)))
-    {
-      search_in_progress_ = true;
-    }
+    activate_delay_.reset(new glib::Timeout(MAX_ENTRY_ACTIVATE_WAIT_TIMEOUT, [this] {
+      if (activate_on_finish_)
+      {
+        activate_on_finish_ = false;
+        active_scope_view_->ActivateFirst();
+      }
+
+      activate_delay_.reset();
+      return false;
+    }));
   }
 }
 
@@ -1254,12 +1259,15 @@
       LOG_DEBUG(logger) << "Search completed: " << search_string;
 
     search_bar_->SetSearchFinished();
-    search_in_progress_ = false;
-
-    activate_timeout_.reset();
-    if (activate_on_finish_ && !err)
-      OnEntryActivated();
-    activate_on_finish_= false;
+
+    if (activate_on_finish_)
+    {
+      activate_on_finish_ = false;
+      activate_delay_.reset();
+
+      if (!err)
+        active_scope_view_->ActivateFirst();
+    }
   }
 }
 
@@ -1407,20 +1415,12 @@
 }
 void DashView::OnEntryActivated()
 {
-  if (active_scope_view_.IsValid() && !search_in_progress_)
-  {
-    active_scope_view_->ActivateFirst();
-  }
-  // delay the activation until we get the SearchFinished signal
-  activate_on_finish_ = search_in_progress_;
-
-  if (activate_on_finish_)
-  {
-    activate_timeout_.reset(new glib::Timeout(MAX_ENTRY_ACTIVATE_WAIT_TIMEOUT, [this] {
-      activate_on_finish_ = false;
+  if (active_scope_view_.IsValid())
+  {
+    if (!activate_delay_ && !search_bar_->in_live_search())
       active_scope_view_->ActivateFirst();
-      return FALSE;
-    }));
+    else
+      activate_on_finish_ = true;
   }
 }
 
 
=== modified file 'dash/DashView.h'
--- dash/DashView.h	2015-02-03 09:46:48 +0000
+++ dash/DashView.h	2015-04-24 13:00:45 +0000
@@ -170,10 +170,8 @@
 
   LocalResult last_activated_result_;
   guint64 last_activated_timestamp_;
-  bool search_in_progress_;
   bool activate_on_finish_;
-  glib::Source::UniquePtr activate_timeout_;
-
+  glib::Source::UniquePtr activate_delay_;
   bool visible_;
 
   nux::ObjectPtr<nux::IOpenGLBaseTexture> dash_view_copy_;
 
=== modified file 'dash/ResultView.cpp'
--- dash/ResultView.cpp	2014-03-20 05:13:04 +0000
+++ dash/ResultView.cpp	2015-04-24 13:00:45 +0000
@@ -23,6 +23,7 @@
 
 #include "ResultView.h"
 
+#include <boost/algorithm/string.hpp>
 #include <Nux/Layout.h>
 
 #include "unity-shared/IntrospectableWrappers.h"
@@ -49,6 +50,7 @@
   , scale(DEFAULT_SCALE)
   , renderer_(NULL)
   , cached_result_(nullptr, nullptr, nullptr)
+  , default_click_activation_(ActivateType::PREVIEW)
 {
   expanded.changed.connect([this](bool value)
   {
@@ -61,6 +63,21 @@
     NeedRedraw();
   });
 
+  default_click_activation.SetGetterFunction([this] {
+    if (Settings::Instance().double_click_activate())
+      return default_click_activation_;
+    return ActivateType::DIRECT;
+  });
+
+  default_click_activation.SetSetterFunction([this] (ActivateType at) {
+    if (default_click_activation_ != at)
+    {
+      default_click_activation_ = at;
+      return true;
+    }
+    return false;
+  });
+
   Settings::Instance().font_scaling.changed.connect(sigc::mem_fun(this, &ResultView::UpdateFontScale));
   enable_texture_render.changed.connect(sigc::mem_fun(this, &ResultView::OnEnableRenderToTexture));
   scale.changed.connect(sigc::mem_fun(this, &ResultView::UpdateScale));
@@ -208,6 +225,14 @@
   return LocalResult(*GetIteratorAtRow(index));
 }
 
+ResultView::ActivateType ResultView::GetLocalResultActivateType(LocalResult const& result) const
+{
+  if (boost::starts_with(result.uri, "x-unity-no-preview"))
+    return ActivateType::DIRECT;
+
+  return ActivateType::PREVIEW;
+}
+
 void ResultView::Draw(nux::GraphicsEngine& GfxContext, bool force_draw)
 {}
 
 
=== modified file 'dash/ResultView.h'
--- dash/ResultView.h	2014-03-20 05:13:04 +0000
+++ dash/ResultView.h	2015-04-24 13:00:45 +0000
@@ -58,12 +58,11 @@
 class ResultView : public nux::View, public debug::Introspectable
 {
 public:
-  typedef enum ActivateType_
+  enum class ActivateType
   {
     DIRECT,
-    PREVIEW_LEFT_BUTTON,
     PREVIEW
-  } ActivateType;
+  };
 
   NUX_DECLARE_OBJECT_TYPE(ResultView, nux::View);
 
@@ -73,8 +72,9 @@
   void SetModelRenderer(ResultRenderer* renderer);
   void SetResultsModel(Results::Ptr const& results);
 
-  unsigned int GetIndexForLocalResult(LocalResult const& local_result);
+  unsigned int GetIndexForLocalResult(LocalResult const&);
   LocalResult GetLocalResultForIndex(unsigned int);
+  ActivateType GetLocalResultActivateType(LocalResult const&) const;
 
   nux::Property<bool> expanded;
   nux::Property<int> results_per_row;
@@ -82,6 +82,7 @@
   nux::Property<float> desaturation_progress;
   nux::Property<bool> enable_texture_render;
   nux::Property<double> scale;
+  nux::RWProperty<ActivateType> default_click_activation;
 
   sigc::signal<void, LocalResult const&, ActivateType, GVariant*> ResultActivated;
 
@@ -130,6 +131,7 @@
   void UpdateFontScale(double scale);
 
   Result cached_result_;
+  ActivateType default_click_activation_;
   connection::Manager result_connections_;
 };
 
 
=== modified file 'dash/ResultViewGrid.cpp'
--- dash/ResultViewGrid.cpp	2014-03-20 04:05:39 +0000
+++ dash/ResultViewGrid.cpp	2015-04-24 13:00:45 +0000
@@ -24,8 +24,6 @@
 #include <NuxCore/Logger.h>
 #include <Nux/VLayout.h>
 #include <NuxGraphics/GdkGraphics.h>
-#include <gtk/gtk.h>
-#include <gdk/gdk.h>
 #include <unity-protocol.h>
 
 #include "unity-shared/IntrospectableWrappers.h"
@@ -34,7 +32,6 @@
 #include "unity-shared/UBusMessages.h"
 #include "unity-shared/GraphicsUtils.h"
 #include "unity-shared/RawPixel.h"
-#include "unity-shared/UnitySettings.h"
 #include "unity-shared/WindowManager.h"
 #include "ResultViewGrid.h"
 #include "math.h"
@@ -94,8 +91,7 @@
   scale.changed.connect(sigc::mem_fun(this, &ResultViewGrid::UpdateScale));
 
   key_nav_focus_change.connect(sigc::mem_fun(this, &ResultViewGrid::OnKeyNavFocusChange));
-  key_nav_focus_activate.connect([this] (nux::Area *area)
-  {
+  key_nav_focus_activate.connect([this] (nux::Area *area) {
     Activate(focused_result_, selected_index_, ResultView::ActivateType::DIRECT);
   });
   key_down.connect(sigc::mem_fun(this, &ResultViewGrid::OnKeyDown));
@@ -210,6 +206,12 @@
     row_y += row_index * row_height;
   }
 
+  if (type == ActivateType::PREVIEW)
+  {
+    if (GetLocalResultActivateType(local_result) != type)
+      type = ActivateType::DIRECT;
+  }
+
   active_index_ = index;
   guint64 timestamp = nux::GetGraphicsDisplay()->GetCurrentEvent().x11_timestamp;
   glib::Variant data(g_variant_new("(tiiiiii)", timestamp, column_x, row_y, column_width, row_height, left_results, right_results));
@@ -796,6 +798,7 @@
   unsigned num_results = GetNumResults();
   unsigned index = GetIndexAtPosition(x, y);
   mouse_over_index_ = index;
+
   if (index < num_results)
   {
     // we got a click on a button so activate it
@@ -805,32 +808,32 @@
     focused_result_ = result;
     activated_result_ = result;
 
-
     if (nux::GetEventButton(button_flags) == nux::NUX_MOUSE_BUTTON1)
     {
-      if (unity::Settings::Instance().double_click_activate)
+      if (default_click_activation() == ActivateType::PREVIEW &&
+          GetLocalResultActivateType(activated_result_) == ActivateType::PREVIEW)
       {
         // delay activate for single left click. (for double click check)
-        activate_timer_.reset(new glib::Timeout(DOUBLE_CLICK_SPEED, [this, index]() {
-          Activate(activated_result_, index, ResultView::ActivateType::PREVIEW_LEFT_BUTTON);
+        activate_timer_.reset(new glib::Timeout(DOUBLE_CLICK_SPEED, [this, index] {
+          Activate(activated_result_, index, ActivateType::PREVIEW);
           return false;
         }));
       }
       else
       {
-        Activate(activated_result_, index, ResultView::ActivateType::DIRECT);
+        Activate(activated_result_, index, ActivateType::DIRECT);
       }
     }
     else
     {
-       Activate(activated_result_, index, ResultView::ActivateType::PREVIEW);
+      Activate(activated_result_, index, ActivateType::PREVIEW);
     }
   }
 }
 
 void ResultViewGrid::MouseDoubleClick(int x, int y, unsigned long button_flags, unsigned long key_flags)
 {
-  if (unity::Settings::Instance().double_click_activate == false)
+  if (default_click_activation() == ActivateType::DIRECT)
     return;
 
   unsigned num_results = GetNumResults();
@@ -845,7 +848,7 @@
     focused_result_ = result;
 
     activated_result_ = result;
-    Activate(activated_result_, index, ResultView::ActivateType::DIRECT);
+    Activate(activated_result_, index, ActivateType::DIRECT);
   }
 }
 
 
=== modified file 'dash/ScopeView.cpp'
--- dash/ScopeView.cpp	2014-07-11 22:26:26 +0000
+++ dash/ScopeView.cpp	2015-04-24 13:00:45 +0000
@@ -481,47 +481,40 @@
   /* Reset result count */
   counts_[group] = 0;
 
-  ResultView* results_view = nullptr;
+  auto* results_view = new ResultViewGrid(NUX_TRACKER_LOCATION);
+
   if (category.GetContentType() == "social" && category.renderer_name == "default")
   {
-    results_view = new ResultViewGrid(NUX_TRACKER_LOCATION);
     results_view->SetModelRenderer(new ResultRendererHorizontalTile(NUX_TRACKER_LOCATION));
-    static_cast<ResultViewGrid*> (results_view)->horizontal_spacing = CARD_VIEW_GAP_HORIZ.CP(scale());
-    static_cast<ResultViewGrid*> (results_view)->vertical_spacing   = CARD_VIEW_GAP_VERT.CP(scale());
+    results_view->horizontal_spacing = CARD_VIEW_GAP_HORIZ.CP(scale());
+    results_view->vertical_spacing   = CARD_VIEW_GAP_VERT.CP(scale());
   }
   else
   {
-    results_view = new ResultViewGrid(NUX_TRACKER_LOCATION);
     results_view->SetModelRenderer(new ResultRendererTile(NUX_TRACKER_LOCATION));
   }
 
   if (scope_)
   {
-    const std::string category_id = category.id();
-    std::string unique_id = category.name() + scope_->name();
-    results_view->unique_id = unique_id;
+    results_view->unique_id = name + scope_->name();
     results_view->expanded = false;
 
-    results_view->ResultActivated.connect([this, unique_id, category_id] (LocalResult const& local_result, ResultView::ActivateType type, GVariant* data)
-    {
-      if (g_str_has_prefix(local_result.uri.c_str(), "x-unity-no-preview"))
-        type = ResultView::ActivateType::DIRECT;
-
-      // Applications scope results should be activated on left-click (instead of preview). Note that app scope can still
-      // respond with preview for activation request (the case for uninstalled apps).
-      bool is_app_scope_result = (scope_->id() == "applications.scope" || (scope_->id() == "home.scope" && category_id == "applications.scope"));
-
-      if (is_app_scope_result && type == ResultView::ActivateType::PREVIEW_LEFT_BUTTON)
-        type = ResultView::ActivateType::DIRECT;
-
-      result_activated.emit(type, local_result, data, unique_id);
+    if (scope_->id() == "applications.scope" ||
+        (scope_->id() == "home.scope" && category.id() == "applications.scope"))
+    {
+      results_view->default_click_activation = ResultView::ActivateType::DIRECT;
+    }
+
+    results_view->ResultActivated.connect([this, results_view] (LocalResult const& local_result, ResultView::ActivateType type, GVariant* data)
+    {
+      result_activated.emit(type, local_result, data, results_view->unique_id());
+
       switch (type)
       {
         case ResultView::ActivateType::DIRECT:
         {
           scope_->Activate(local_result, nullptr, cancellable_);
         } break;
-        case ResultView::ActivateType::PREVIEW_LEFT_BUTTON:
         case ResultView::ActivateType::PREVIEW:
         {
           scope_->Preview(local_result, nullptr, cancellable_);
 
=== modified file 'hud/HudButton.cpp'
--- hud/HudButton.cpp	2014-07-30 00:49:35 +0000
+++ hud/HudButton.cpp	2015-04-24 13:00:45 +0000
@@ -20,11 +20,6 @@
  */
 #include "config.h"
 
-#include <pango/pango.h>
-#include <pango/pangocairo.h>
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
-
 #include <Nux/Nux.h>
 #include <Nux/HLayout.h>
 #include <NuxGraphics/CairoGraphics.h>
 
=== modified file 'hud/HudController.h'
--- hud/HudController.h	2014-07-11 01:45:49 +0000
+++ hud/HudController.h	2015-04-24 13:00:45 +0000
@@ -22,7 +22,6 @@
 #include <functional>
 #include <memory>
 
-#include <gdk/gdk.h>
 #include <UnityCore/Hud.h>
 #include <UnityCore/GLibSignal.h>
 
 
=== modified file 'launcher/DeviceNotificationDisplayImp.cpp'
--- launcher/DeviceNotificationDisplayImp.cpp	2013-10-03 23:48:48 +0000
+++ launcher/DeviceNotificationDisplayImp.cpp	2015-04-24 13:00:45 +0000
@@ -17,7 +17,6 @@
  * Authored by: Andrea Azzarone <[e-mail]>
  */
 
-#include <gdk/gdk.h>
 #include "config.h"
 #include <glib/gi18n-lib.h>
 #include <libnotify/notify.h>
 
=== modified file 'unity-shared/BGHash.cpp'
--- unity-shared/BGHash.cpp	2014-12-11 12:54:37 +0000
+++ unity-shared/BGHash.cpp	2015-04-24 13:00:45 +0000
@@ -116,8 +116,11 @@
                       .SetDuration(skip_animation ? 0 : TRANSITION_DURATION)
                       .Start();
 
-  // This will make sure that the animation starts even if the screen is idle.
-  nux::GetWindowThread()->RequestRedraw();
+  if (nux::WindowThread* wt = nux::GetWindowThread())
+  {
+    // This will make sure that the animation starts even if the screen is idle.
+    wt->RequestRedraw();
+  }
 }
 
 void BGHash::OnTransitionUpdated(nux::Color const& new_color)
 
=== modified file 'unity-shared/SearchBar.cpp'
--- unity-shared/SearchBar.cpp	2014-09-04 22:11:33 +0000
+++ unity-shared/SearchBar.cpp	2015-04-24 13:00:45 +0000
@@ -141,6 +141,9 @@
   : View(NUX_FILE_LINE_PARAM)
   , showing_filters(false)
   , can_refine_search(false)
+  , im_active([this] { return pango_entry_->im_active(); })
+  , im_preedit([this] { return pango_entry_->im_preedit(); })
+  , in_live_search([this] { return live_search_timeout_ && live_search_timeout_->IsRunning(); })
   , live_search_wait(DEFAULT_LIVE_SEARCH_TIMEOUT)
   , scale(DEFAULT_SCALE)
   , show_filter_hint_(show_filter_hint)
@@ -179,11 +182,11 @@
   pango_entry_->mouse_down.connect(sigc::mem_fun(this, &SearchBar::OnMouseButtonDown));
   pango_entry_->end_key_focus.connect(sigc::mem_fun(this, &SearchBar::OnEndKeyFocus));
   pango_entry_->key_up.connect([this] (unsigned int, unsigned long, unsigned long) {
-      if (get_im_preedit())
-      {
-        hint_->SetVisible(false);
-        hint_->QueueDraw();
-      }
+    if (im_preedit())
+    {
+      hint_->SetVisible(false);
+      hint_->QueueDraw();
+    }
   });
 
   layered_layout_ = new nux::LayeredLayout();
@@ -263,10 +266,8 @@
   OnFontChanged();
 
   search_hint.changed.connect([this](std::string const& s) { OnSearchHintChanged(); });
-  search_string.SetGetterFunction(sigc::mem_fun(this, &SearchBar::get_search_string));
+  search_string.SetGetterFunction([this] { return pango_entry_->GetText(); });
   search_string.SetSetterFunction(sigc::mem_fun(this, &SearchBar::set_search_string));
-  im_active.SetGetterFunction(sigc::mem_fun(this, &SearchBar::get_im_active));
-  im_preedit.SetGetterFunction(sigc::mem_fun(this, &SearchBar::get_im_preedit));
   showing_filters.changed.connect(sigc::mem_fun(this, &SearchBar::OnShowingFiltersChanged));
   scale.changed.connect(sigc::mem_fun(this, &SearchBar::UpdateScale));
   Settings::Instance().font_scaling.changed.connect(sigc::hide(sigc::mem_fun(this, &SearchBar::UpdateSearchBarSize)));
@@ -633,11 +634,6 @@
   return expander_view_;
 }
 
-std::string SearchBar::get_search_string() const
-{
-  return pango_entry_->GetText();
-}
-
 bool SearchBar::set_search_string(std::string const& string)
 {
   pango_entry_->SetText(string.c_str());
@@ -649,16 +645,6 @@
   return true;
 }
 
-bool SearchBar::get_im_active() const
-{
-  return pango_entry_->im_active();
-}
-
-bool SearchBar::get_im_preedit() const
-{
-  return pango_entry_->im_preedit();
-}
-
 //
 // Highlight
 //
 
=== modified file 'unity-shared/SearchBar.h'
--- unity-shared/SearchBar.h	2014-08-06 19:46:43 +0000
+++ unity-shared/SearchBar.h	2015-04-24 13:00:45 +0000
@@ -63,6 +63,7 @@
   nux::Property<bool> can_refine_search;
   nux::ROProperty<bool> im_active;
   nux::ROProperty<bool> im_preedit;
+  nux::ROProperty<bool> in_live_search;
   nux::Property<unsigned> live_search_wait;
   nux::Property<double> scale;
 
@@ -88,10 +89,7 @@
   bool OnLiveSearchTimeout();
   bool OnSpinnerStartCb();
 
-  std::string get_search_string() const;
   bool set_search_string(std::string const& string);
-  bool get_im_active() const;
-  bool get_im_preedit() const;
   bool show_filter_hint_;
 
   std::string GetName() const;