Merge lp:~3v1n0/unity/panel-menus-flickering-fix into lp:unity

[Marco Trevisan (Treviño)]

PanelMenuView: ignore leave events when triggered by feeding nux manually

WindowManager::Default().UnGrabMousePointer uses ProcessForeignEvent to send
a ButtonRelease event, and this breaks the panel. So we need to ignore this.

PanelMenuView: ignore leave events when triggered by feeding nux manually

WindowManager::Default().UnGrabMousePointer uses ProcessForeignEvent to send
a ButtonRelease event, and this breaks the panel. So we need to ignore this.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:4030
http://jenkins.qa.ubuntu.com/job/unity-ci/1339/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-amd64-ci/116
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-armhf-ci/115
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-i386-ci/114/console

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

review: Needs Fixing (continuous-integration)

[Andrea Azzarone (azzar1)]

LGTM.

review: Approve

=== modified file 'lockscreen/LockScreenPanel.cpp'
--- lockscreen/LockScreenPanel.cpp	2015-02-02 14:37:11 +0000
+++ lockscreen/LockScreenPanel.cpp	2015-11-05 14:58:42 +0000
@@ -165,10 +165,12 @@
   if (!GetInputEventSensitivity())
     return;
 
-  // This is ugly... But Nux fault!
-  WindowManager::Default().UnGrabMousePointer(CurrentTime, button, x, y);
-
-  active = true;
+  if (!active)
+  {
+    // This is ugly... But Nux fault!
+    WindowManager::Default().UnGrabMousePointer(CurrentTime, button, x, y);
+    active = true;
+  }
 }
 
 void Panel::OnEntryActivateRequest(std::string const& entry_id)

=== modified file 'panel/PanelMenuView.cpp'
--- panel/PanelMenuView.cpp	2015-09-10 15:37:27 +0000
+++ panel/PanelMenuView.cpp	2015-11-05 14:58:42 +0000
@@ -102,6 +102,7 @@
   , ignore_menu_visibility_(false)
   , integrated_menus_(menu_manager_->integrated_menus())
   , always_show_menus_(menu_manager_->always_show_menus())
+  , ignore_leave_events_(false)
   , desktop_name_(get_current_desktop())
 {
   if (ApplicationWindowPtr const& win = ApplicationManager::Default().GetActiveWindow())
@@ -1814,9 +1815,14 @@
   }
 }
 
+void PanelMenuView::IgnoreLeaveEvents(bool ignore)
+{
+  ignore_leave_events_ = ignore;
+}
+
 void PanelMenuView::OnPanelViewMouseLeave(int x, int y, unsigned long mouse_button_state, unsigned long special_keys_state)
 {
-  if (always_show_menus_)
+  if (always_show_menus_ || ignore_leave_events_)
     return;
 
   if (is_inside_)

=== modified file 'panel/PanelMenuView.h'
--- panel/PanelMenuView.h	2015-09-10 15:37:27 +0000
+++ panel/PanelMenuView.h	2015-11-05 14:58:42 +0000
@@ -56,6 +56,7 @@
   bool HasKeyActivableMenus() const;
 
   void NotifyAllMenusClosed();
+  void IgnoreLeaveEvents(bool);
 
   virtual void AddIndicator(indicator::Indicator::Ptr const& indicator);
 
@@ -191,6 +192,7 @@
   bool ignore_menu_visibility_;
   bool integrated_menus_;
   bool always_show_menus_;
+  bool ignore_leave_events_;
 
   nux::Geometry monitor_geo_;
   const std::string desktop_name_;

=== modified file 'panel/PanelView.cpp'
--- panel/PanelView.cpp	2015-09-21 09:25:58 +0000
+++ panel/PanelView.cpp	2015-11-05 14:58:42 +0000
@@ -682,7 +682,7 @@
   tracked_pointer_pos_ = mouse;
 
   double scale = Settings::Instance().em(monitor_)->DPIScale();
-  if (speed > 0 && PointInTriangle(mouse, 
+  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)))
@@ -738,8 +738,13 @@
 void PanelView::OnEntryShowMenu(std::string const& entry_id, unsigned xid,
                                 int x, int y, unsigned button)
 {
-  // This is ugly... But Nux fault!
-  WindowManager::Default().UnGrabMousePointer(CurrentTime, button, x, y);
+  if (!track_menu_pointer_timeout_)
+  {
+    // This is ugly... But Nux fault!
+    menu_view_->IgnoreLeaveEvents(true);
+    WindowManager::Default().UnGrabMousePointer(CurrentTime, button, x, y);
+    menu_view_->IgnoreLeaveEvents(false);
+  }
 }
 
 bool PanelView::ActivateFirstSensitive()