Merge lp:~azzar1/unity/lp-552920 into lp:unity

[Andrea Azzarone]

Avoid to open adjacent menu when moving from an indicator icon to its dropdown menu.

Basically we use the "triangle technique" [1] to avoid using delays. We cannot make it perfect because we are not monitoring mouse motion events directly but we are using XQueryPointer to get the mouse coordinates because gtk owns the mouse grab. Btw it significantly improves the current behavior.

[1] https://usercontent.irccloud-cdn.com/file/qXGkfaSw/triangle.png

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3985
http://jenkins.qa.ubuntu.com/job/unity-ci/1281/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-amd64-ci/59
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-armhf-ci/57
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-i386-ci/57

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

review: Approve (continuous-integration)

[Marco Trevisan (Treviño) (3v1n0)]

Very nice technique, and it will improve also when adding proper input monitoring with xinput2.

There Check the comments, mostly style stuff, btw.

[Andrea Azzarone (azzar1)]

Done. Please take a look at the inline comments.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:4010
http://jenkins.qa.ubuntu.com/job/unity-ci/1301/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-amd64-ci/79/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-armhf-ci/77
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-i386-ci/77/console

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

review: Needs Fixing (continuous-integration)

[Marco Trevisan (Treviño) (3v1n0)]

Yeah, looks fine now.

review: Approve

=== modified file 'panel/PanelView.cpp'
--- panel/PanelView.cpp	2015-04-21 15:12:02 +0000
+++ panel/PanelView.cpp	2015-09-21 09:31:23 +0000
@@ -24,6 +24,7 @@
 #include <UnityCore/GLibWrapper.h>
 
 #include "unity-shared/PanelStyle.h"
+#include "unity-shared/RawPixel.h"
 #include "unity-shared/TextureCache.h"
 #include "unity-shared/WindowManager.h"
 #include "unity-shared/UBusMessages.h"
@@ -33,15 +34,16 @@
 
 #include "PanelView.h"
 
+namespace unity
+{
+namespace panel
+{
 namespace
 {
+const RawPixel TRIANGLE_THRESHOLD = 5_em;
 const int refine_gradient_midpoint = 959;
 }
 
-namespace unity
-{
-namespace panel
-{
 
 NUX_IMPLEMENT_OBJECT_TYPE(PanelView);
 
@@ -635,23 +637,75 @@
   }
 }
 
+static bool PointInTriangle(nux::Point const& p, nux::Point const& t0, nux::Point const& t1, nux::Point const& t2)
+{
+  int s = t0.y * t2.x - t0.x * t2.y + (t2.y - t0.y) * p.x + (t0.x - t2.x) * p.y;
+  int t = t0.x * t1.y - t0.y * t1.x + (t0.y - t1.y) * p.x + (t1.x - t0.x) * p.y;
+
+  if ((s < 0) != (t < 0))
+    return false;
+
+  int A = -t1.y * t2.x + t0.y * (t2.x - t1.x) + t0.x * (t1.y - t2.y) + t1.x * t2.y;
+  if (A < 0)
+  {
+    s = -s;
+    t = -t;
+    A = -A;
+  }
+
+  return s > 0 && t > 0 && (s + t) < A;
+}
+
+static double GetMouseVelocity(nux::Point const& p0, nux::Point const& p1, util::Timer &timer)
+{
+  int dx, dy;
+  double speed;
+  auto millis = timer.ElapsedMicroSeconds();
+
+  if (millis == 0)
+    return 1;
+
+  dx = p0.x - p1.x;
+  dy = p0.y - p1.y;
+
+  speed = sqrt(dx * dx + dy * dy) / millis * 1000;
+
+  return speed;
+}
+
 bool PanelView::TrackMenuPointer()
 {
   nux::Point const& mouse = nux::GetGraphicsDisplay()->GetMouseScreenCoord();
-  if (tracked_pointer_pos_ != mouse)
-  {
+  double speed = GetMouseVelocity(mouse, tracked_pointer_pos_, mouse_tracker_timer_);
+
+  mouse_tracker_timer_.Reset();
+  tracked_pointer_pos_ = mouse;
+
+  double scale = Settings::Instance().em(monitor_)->DPIScale();
+  if (speed > 0 && PointInTriangle(mouse, 
+                                   nux::Point(triangle_top_corner_.x, std::max(triangle_top_corner_.y - TRIANGLE_THRESHOLD.CP(scale), 0)),
+                                   nux::Point(menu_geo_.x, menu_geo_.y),
+                                   nux::Point(menu_geo_.x + menu_geo_.width, menu_geo_.y)))
+  {
+    return true;
+  }
+
+  if (mouse != triangle_top_corner_)
+  {
+    triangle_top_corner_ = mouse;
     OnMenuPointerMoved(mouse.x, mouse.y);
-    tracked_pointer_pos_ = mouse;
   }
 
   return true;
 }
 
-void PanelView::OnEntryActivated(std::string const& panel, std::string const& entry_id, nux::Rect const&)
+void PanelView::OnEntryActivated(std::string const& panel, std::string const& entry_id, nux::Rect const& menu_geo)
 {
   if (!panel.empty() && panel != GetPanelName())
     return;
 
+  menu_geo_ = menu_geo;
+
   bool active = !entry_id.empty();
   if (active && !track_menu_pointer_timeout_)
   {
@@ -665,6 +719,8 @@
     // process. All the motion events will go to unity-panel-service while
     // scrubbing because the active panel menu has (needs) the pointer grab.
     //
+    mouse_tracker_timer_.Reset();
+    triangle_top_corner_ = nux::GetGraphicsDisplay()->GetMouseScreenCoord();
     track_menu_pointer_timeout_.reset(new glib::Timeout(16));
     track_menu_pointer_timeout_->Run(sigc::mem_fun(this, &PanelView::TrackMenuPointer));
   }

=== modified file 'panel/PanelView.h'
--- panel/PanelView.h	2015-04-21 15:12:02 +0000
+++ panel/PanelView.h	2015-09-21 09:31:23 +0000
@@ -35,6 +35,7 @@
 #include "unity-shared/Introspectable.h"
 #include "unity-shared/MenuManager.h"
 #include "unity-shared/MockableBaseWindow.h"
+#include "unity-shared/Timer.h"
 #include "PanelMenuView.h"
 #include "PanelTray.h"
 #include "PanelIndicatorsView.h"
@@ -132,7 +133,8 @@
   std::unique_ptr<nux::AbstractPaintLayer> bg_refine_single_column_layer_;
 
   std::string active_overlay_;
-  nux::Point  tracked_pointer_pos_;
+  nux::Point  tracked_pointer_pos_, triangle_top_corner_;
+  util::Timer mouse_tracker_timer_;
 
   bool is_dirty_;
   bool opacity_maximized_toggle_;
@@ -142,6 +144,8 @@
   int monitor_;
   int stored_dash_width_;
 
+  nux::Geometry menu_geo_;
+
   connection::Manager on_indicator_updated_connections_;
   connection::Manager maximized_opacity_toggle_connections_;
   BackgroundEffectHelper bg_effect_helper_;