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

[Nick Dedekind]

Result preview activated on left single-click. Normal result activation on double-click.

Result preview activated on left single-click. Normal result activation on double-click.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Nick Dedekind (nick-dedekind)]

requires
lp:~nick-dedekind/nux/double-click-fix

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Michal Hruby (mhr3)]

Not approving just yet, as this will break half of AP tests.

[Michal Hruby (mhr3)]

This is a high-prio feature, so approving right before landing. The tests will be updated shortly with a different branch. (probably once merged in trunk)

review: Approve

[Nick Dedekind (nick-dedekind)]

217 - def activate(self):
218 + def activate(self, double_click=True):
219 tx = self.x + (self.width / 2)
220 ty = self.y + (self.height / 2)
221 self.mouse.move(tx, ty)
222 self.mouse.click(1)
223 + if double_click:
224 + self.mouse.click(1)
225
226 - def preview(self):
227 + def preview(self, button=1):
228 tx = self.x + (self.width / 2)
229 ty = self.y + (self.height / 2)
230 self.mouse.move(tx, ty)
231 - self.mouse.click(3)
232 + self.mouse.click(button)

Should be handling double click activate change in AP

=== modified file 'com.canonical.Unity.gschema.xml'
--- com.canonical.Unity.gschema.xml	2013-03-20 11:25:40 +0000
+++ com.canonical.Unity.gschema.xml	2013-05-03 19:01:31 +0000
@@ -41,6 +41,11 @@
       <summary>The number of minimizations required to reach maximum speed.</summary>
       <description>The speed of the minimize animation will progressively get faster as minimize-count approaches this value.</description>
     </key>
+    <key type="b" name="double-click-activate">
+      <default>true</default>
+      <summary>Enable/Disable dash result double-click activation.</summary>
+      <description>This is used to enable/disable double-click result activation in the dash. Double-click to activate, single click preview</description>
+    </key>
   </schema>
   <schema path="/com/canonical/unity/launcher/" id="com.canonical.Unity.Launcher" gettext-domain="unity">
     <key type="as" name="favorites">

=== modified file 'dash/ResultViewGrid.cpp'
--- dash/ResultViewGrid.cpp	2013-04-17 15:10:39 +0000
+++ dash/ResultViewGrid.cpp	2013-05-03 19:01:31 +0000
@@ -34,6 +34,7 @@
 #include "unity-shared/UBusWrapper.h"
 #include "unity-shared/UBusMessages.h"
 #include "unity-shared/GraphicsUtils.h"
+#include "unity-shared/UnitySettings.h"
 #include "ResultViewGrid.h"
 #include "math.h"
 
@@ -51,6 +52,8 @@
 
   const float FOCUSED_GHOST_ICON_OPACITY_REF = 0.7f;
   const float FOCUSED_ICON_SATURATION_REF = 0.5f;
+
+  const int DOUBLE_CLICK_SPEED = 500; //500 ms (double-click speed hardcoded to 400 ms in nux)
 }
 
 NUX_IMPLEMENT_OBJECT_TYPE(ResultViewGrid);
@@ -74,6 +77,7 @@
   , mouse_last_y_(-1)
   , extra_horizontal_spacing_(0)
 {
+  EnableDoubleClick(true);
   SetAcceptKeyNavFocusOnMouseDown(false);
 
   auto needredraw_lambda = [&](int value) { NeedRedraw(); };
@@ -92,6 +96,7 @@
   key_down.connect(sigc::mem_fun(this, &ResultViewGrid::OnKeyDown));
   mouse_move.connect(sigc::mem_fun(this, &ResultViewGrid::MouseMove));
   mouse_click.connect(sigc::mem_fun(this, &ResultViewGrid::MouseClick));
+  mouse_double_click.connect(sigc::mem_fun(this, &ResultViewGrid::MouseDoubleClick));
 
   mouse_down.connect([&](int x, int y, unsigned long mouse_state, unsigned long button_state)
   {
@@ -142,7 +147,7 @@
       int current_index = GetIndexForLocalResult(activated_result_);
       if (nav_mode == -1) // left
       {
-        current_index--;  
+        current_index--;
       }
       else if (nav_mode == 1) // right
       {
@@ -164,7 +169,7 @@
       {
         selected_index_ = active_index_ = current_index;
         activated_result_ = GetLocalResultForIndex(current_index);
-        LOG_DEBUG(logger) << "activating preview for index: " 
+        LOG_DEBUG(logger) << "activating preview for index: "
                   << "(" << current_index << ")"
                   << " " << activated_result_.uri;
         Activate(activated_result_, current_index, ActivateType::PREVIEW);
@@ -178,11 +183,12 @@
 
 void ResultViewGrid::Activate(LocalResult const& local_result, int index, ResultView::ActivateType type)
 {
+  activate_timer_.reset();
   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 
+  //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.
   nux::Geometry abs_geo = GetAbsoluteGeometry();
   int row_y = padding + abs_geo.y;
@@ -242,7 +248,7 @@
       SizeReallocate();
       results_changed_idle_.reset();
       lazy_load_source_.reset(); // no point doing this one as well.
-      
+
       if (!all_results_preloaded_)
       {
         last_lazy_loaded_result_ = 0; // reset the lazy load index in case we got an insert
@@ -289,7 +295,7 @@
   else if (!lazy_load_source_)
   {
     lazy_load_source_.reset(new glib::Idle(glib::Source::Priority::DEFAULT));
-    lazy_load_source_->Run(sigc::mem_fun(this, &ResultViewGrid::DoLazyLoad));   
+    lazy_load_source_->Run(sigc::mem_fun(this, &ResultViewGrid::DoLazyLoad));
   }
   QueueDraw();
 
@@ -686,7 +692,7 @@
         break;
 
       ResultRenderer::ResultRendererState state = ResultRenderer::RESULT_RENDERER_NORMAL;
-      
+
       if (enable_texture_render() == false)
       {
         if (index == selected_index_)
@@ -797,19 +803,56 @@
     Result result = *it;
     selected_index_ = index;
     focused_result_ = result;
-
-    ActivateType type = nux::GetEventButton(button_flags) == nux::MouseButton::MOUSE_BUTTON3 ?  ResultView::ActivateType::PREVIEW :
-                                                                                                ResultView::ActivateType::DIRECT;
-
-    activated_result_ = result;
-    Activate(activated_result_, index, type);
+    activated_result_ = result;
+
+
+    if (nux::GetEventButton(button_flags) == nux::NUX_MOUSE_BUTTON1)
+    {
+      if (unity::Settings::Instance().double_click_activate)
+      {
+        // 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);
+          return false;
+        }));
+      }
+      else
+      {
+        Activate(activated_result_, index, ResultView::ActivateType::DIRECT);
+      }
+    }
+    else
+    {
+       Activate(activated_result_, index, ResultView::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)
+    return;
+
+  unsigned num_results = GetNumResults();
+  unsigned index = GetIndexAtPosition(x, y);
+  mouse_over_index_ = index;
+  if (index < num_results && nux::GetEventButton(button_flags) == nux::NUX_MOUSE_BUTTON1)
+  {
+    // we got a click on a button so activate it
+    ResultIterator it(GetIteratorAtRow(index));
+    Result result = *it;
+    selected_index_ = index;
+    focused_result_ = result;
+
+    activated_result_ = result;
+    Activate(activated_result_, index, ResultView::ActivateType::DIRECT);
   }
 }
 
 unsigned ResultViewGrid::GetIndexAtPosition(int x, int y)
 {
-  if (x < 0 || y < 0) 
-     return -1; 
+  if (x < 0 || y < 0)
+     return -1;
 
   unsigned items_per_row = GetItemsPerRow();
 
@@ -841,8 +884,8 @@
   if (G_UNLIKELY(index >= static_cast<unsigned>(GetNumResults()) || index < 0))
   {
     LOG_ERROR(logger) << "index (" << index << ") does not exist in this category";
-    return std::tuple<int, int>(0,0); 
-  } // out of bounds. 
+    return std::tuple<int, int>(0,0);
+  } // out of bounds.
 
   int items_per_row = GetItemsPerRow();
   int column_size = renderer_->width + horizontal_spacing + extra_horizontal_spacing_;

=== modified file 'dash/ResultViewGrid.h'
--- dash/ResultViewGrid.h	2013-03-27 11:18:56 +0000
+++ dash/ResultViewGrid.h	2013-05-03 19:01:31 +0000
@@ -61,6 +61,7 @@
 protected:
   void MouseMove(int x, int y, int dx, int dy, unsigned long button_flags, unsigned long key_flags);
   void MouseClick(int x, int y, unsigned long button_flags, unsigned long key_flags);
+  void MouseDoubleClick(int x, int y, unsigned long button_flags, unsigned long key_flags);
 
   virtual bool                    DndSourceDragBegin();
   virtual nux::NBitmapData*       DndSourceGetDragImage();
@@ -128,6 +129,8 @@
   glib::Source::UniquePtr lazy_load_source_;
   glib::Source::UniquePtr results_changed_idle_;
   nux::Color background_color_;
+
+  glib::Source::UniquePtr activate_timer_;
 };
 
 } // namespace dash

=== modified file 'tests/autopilot/unity/emulators/dash.py'
--- tests/autopilot/unity/emulators/dash.py	2013-04-17 15:10:39 +0000
+++ tests/autopilot/unity/emulators/dash.py	2013-05-03 19:01:31 +0000
@@ -283,17 +283,19 @@
         self.mouse = get_mouse()
         self.keyboard = get_keyboard()
 
-    def activate(self):
+    def activate(self, double_click=True):
         tx = self.x + (self.width / 2)
         ty = self.y + (self.height / 2)
         self.mouse.move(tx, ty)
         self.mouse.click(1)
+        if double_click:
+            self.mouse.click(1)
 
-    def preview(self):
+    def preview(self, button=1):
         tx = self.x + (self.width / 2)
         ty = self.y + (self.height / 2)
         self.mouse.move(tx, ty)
-        self.mouse.click(3)
+        self.mouse.click(button)
 
     def preview_key(self):
         tx = self.x + (self.width / 2)

=== modified file 'unity-shared/UnitySettings.cpp'
--- unity-shared/UnitySettings.cpp	2012-11-06 18:19:09 +0000
+++ unity-shared/UnitySettings.cpp	2013-05-03 19:01:31 +0000
@@ -35,6 +35,7 @@
 
 const std::string SETTINGS_NAME = "com.canonical.Unity";
 const std::string FORM_FACTOR = "form-factor";
+const std::string DOUBLE_CLICK_ACTIVATE = "double-click-activate";
 }
 
 //
@@ -47,14 +48,20 @@
     : parent_(owner)
     , gsettings_(g_settings_new(SETTINGS_NAME.c_str()))
     , cached_form_factor_(FormFactor::DESKTOP)
+    , cached_double_click_activate_(true)
     , lowGfx_(false)
   {
     CacheFormFactor();
+    CacheDoubleClickActivate();
 
     form_factor_changed_.Connect(gsettings_, "changed::" + FORM_FACTOR, [this] (GSettings*, gchar*) {
       CacheFormFactor();
       parent_->form_factor.changed.emit(cached_form_factor_);
     });
+    double_click_activate_changed_.Connect(gsettings_, "changed::" + DOUBLE_CLICK_ACTIVATE, [this] (GSettings*, gchar*) {
+      CacheDoubleClickActivate();
+      parent_->double_click_activate.changed.emit(cached_double_click_activate_);
+    });
   }
 
   void CacheFormFactor()
@@ -75,6 +82,11 @@
     }
   }
 
+  void CacheDoubleClickActivate()
+  {
+    cached_double_click_activate_ = g_settings_get_boolean(gsettings_, DOUBLE_CLICK_ACTIVATE.c_str());
+  }
+
   FormFactor GetFormFactor() const
   {
     return cached_form_factor_;
@@ -86,12 +98,19 @@
     return true;
   }
 
+  bool GetDoubleClickActivate() const
+  {
+    return cached_double_click_activate_;
+  }
+
   Settings* parent_;
   glib::Object<GSettings> gsettings_;
   FormFactor cached_form_factor_;
+  bool cached_double_click_activate_;
   bool lowGfx_;
 
   glib::Signal<void, GSettings*, gchar* > form_factor_changed_;
+  glib::Signal<void, GSettings*, gchar* > double_click_activate_changed_;
 };
 
 //
@@ -106,12 +125,14 @@
   {
     LOG_ERROR(logger) << "More than one unity::Settings created.";
   }
-  
+
   else
-  { 
+  {
     form_factor.SetGetterFunction(sigc::mem_fun(*pimpl, &Impl::GetFormFactor));
     form_factor.SetSetterFunction(sigc::mem_fun(*pimpl, &Impl::SetFormFactor));
 
+    double_click_activate.SetGetterFunction(sigc::mem_fun(*pimpl, &Impl::GetDoubleClickActivate));
+
     settings_instance = this;
   }
 }

=== modified file 'unity-shared/UnitySettings.h'
--- unity-shared/UnitySettings.h	2012-11-06 18:19:09 +0000
+++ unity-shared/UnitySettings.h	2013-05-03 19:01:31 +0000
@@ -47,6 +47,7 @@
 
   nux::RWProperty<FormFactor> form_factor;
   nux::Property<bool> is_standalone;
+  nux::ROProperty<bool> double_click_activate;
 
 private:
   class Impl;