Merge lp:~3v1n0/unity/panelmenu-on-mousegrab-fixes into lp:unity

[Marco Trevisan (Treviño)]

Fixing bug #888650 and bug #890970 which caused the global menubar to not correctly react to mouse events when an indicator menu is open.

Since compiz can't get the mouse position when the unity-panel-service grabs the mouse, we need to manually update the mouse position and send it to the menubar to make it correctly draw also when the Nux events aren't emitted.

Tests for this code will come as soon as possible (i.e when the autopilot will be completed).

[Tim Penhey (thumper)]

Code looks good to me.

One point, can you use the new "nullptr" from the C++11 standard instead of "NULL" please.

Perhaps this will be best tested with autopilot?

Marking as needs fixing until we can find a test for this.

review: Needs Fixing

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

Code updated.

Yes, I hope to test this with autopilot.

[Tim Penhey (thumper)]

Add a manual test, and look to land this.

review: Needs Fixing

[Tim Penhey (thumper)]

review: Approve

=== added file 'manual-tests/PanelIndicators.txt'
--- manual-tests/PanelIndicators.txt	1970-01-01 00:00:00 +0000
+++ manual-tests/PanelIndicators.txt	2011-12-08 04:53:24 +0000
@@ -0,0 +1,27 @@
+Menus and Active Indicators
+---------------------------
+This test shows the interaction between the global menu and open indicators.
+
+#. Start on a clean screen
+#. Open an application that has menus (i.e a gnome-terminal)
+#. Open an indicator Menu (i.e. indicator sound)
+#. Move the mouse pointer on the PanelMenuGrabArea (i.e the area between the
+   indicators and the global menu)
+
+Outcome
+  The menu should appear. This was happening only when going over the menus,
+  not over the empty panel area.
+
+
+Window Buttons and Active Indicators
+------------------------------------
+This test shows the interaction between the window buttons and open indicators.
+
+#. Start on a clean screen
+#. Open an application that has menus (i.e a gnome-terminal)
+#. Maximize it
+#. Open an indicator Menu (i.e. indicator sound)
+#. Move the mouse pointer on the top-left corner of the screen
+
+Outcome
+  Window buttons should appear.
 
=== modified file 'plugins/unityshell/src/PanelIndicatorsView.cpp'
--- plugins/unityshell/src/PanelIndicatorsView.cpp	2011-10-11 18:18:13 +0000
+++ plugins/unityshell/src/PanelIndicatorsView.cpp	2011-12-08 04:53:24 +0000
@@ -121,19 +121,20 @@
     entry.second->QueueDraw();
 }
 
-bool
+PanelIndicatorEntryView*
 PanelIndicatorsView::ActivateEntry(std::string const& entry_id)
 {
   auto entry = entries_.find(entry_id);
 
   if (entry != entries_.end() && entry->second->IsEntryValid())
   {
+    PanelIndicatorEntryView* view = entry->second;
     LOG_DEBUG(logger) << "Activating: " << entry_id;
-    entry->second->Activate();
-    return true;
+    view->Activate();
+    return view;
   }
 
-  return false;
+  return nullptr;
 }
 
 bool
@@ -163,10 +164,10 @@
     entry.second->GetGeometryForSync(locations);
 }
 
-bool
-PanelIndicatorsView::OnPointerMoved(int x, int y)
+PanelIndicatorEntryView*
+PanelIndicatorsView::ActivateEntryAt(int x, int y)
 {
-  PanelIndicatorEntryView* target = NULL;
+  PanelIndicatorEntryView* target = nullptr;
   bool found_old_active = false;
 
   //
@@ -207,7 +208,7 @@
     }
   }
 
-  return (target != NULL);
+  return target;
 }
 
 void
 
=== modified file 'plugins/unityshell/src/PanelIndicatorsView.h'
--- plugins/unityshell/src/PanelIndicatorsView.h	2011-11-28 21:27:17 +0000
+++ plugins/unityshell/src/PanelIndicatorsView.h	2011-12-08 04:53:24 +0000
@@ -56,8 +56,8 @@
                                     IndicatorEntryType type = IndicatorEntryType::INDICATOR);
   void RemoveEntry(std::string const& entry_id);
 
-  bool OnPointerMoved(int x, int y);
-  bool ActivateEntry(std::string const& entry_id);
+  PanelIndicatorEntryView* ActivateEntryAt(int x, int y);
+  PanelIndicatorEntryView* ActivateEntry(std::string const& entry_id);
   bool ActivateIfSensitive();
   void GetGeometryForSync(indicator::EntryLocationMap& locations);
 
 
=== modified file 'plugins/unityshell/src/PanelMenuView.cpp'
--- plugins/unityshell/src/PanelMenuView.cpp	2011-12-05 14:53:17 +0000
+++ plugins/unityshell/src/PanelMenuView.cpp	2011-12-08 04:53:24 +0000
@@ -1485,5 +1485,24 @@
 void PanelMenuView::OnPanelViewMouseMove(int x, int y, int dx, int dy, unsigned long mouse_button_state, unsigned long special_keys_state)
 {}
 
-
+void PanelMenuView::SetMousePosition(int x, int y)
+{
+  if (_last_active_view ||
+      (x >= 0 && y >= 0 && GetAbsoluteGeometry().IsPointInside(x, y)))
+  {
+    if (!_is_inside)
+    {
+      _is_inside = true;
+      FullRedraw();
+    }
+  }
+  else
+  {
+    if (_is_inside)
+    {
+      _is_inside = false;
+      FullRedraw();
+    }
+  }
+}
 } // namespace unity
 
=== modified file 'plugins/unityshell/src/PanelMenuView.h'
--- plugins/unityshell/src/PanelMenuView.h	2011-11-28 21:27:17 +0000
+++ plugins/unityshell/src/PanelMenuView.h	2011-12-08 04:53:24 +0000
@@ -60,6 +60,8 @@
   virtual void DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw);
   virtual long PostLayoutManagement(long LayoutResult);
 
+  void SetMousePosition(int x, int y);
+
   void OnActiveChanged(PanelIndicatorEntryView* view, bool is_active);
   void OnActiveWindowChanged(BamfView* old_view, BamfView* new_view);
   void OnNameChanged(gchar* new_name, gchar* old_name);
 
=== modified file 'plugins/unityshell/src/PanelView.cpp'
--- plugins/unityshell/src/PanelView.cpp	2011-10-25 16:08:30 +0000
+++ plugins/unityshell/src/PanelView.cpp	2011-12-08 04:53:24 +0000
@@ -465,12 +465,18 @@
 
   if (geo.IsPointInside(x, y))
   {
-    bool ret = false;
+    PanelIndicatorEntryView* view = nullptr;
 
     if (!_menu_view->HasOurWindowFocused())
-      ret = _menu_view->OnPointerMoved(x, y);
-
-    if (!ret) _indicators->OnPointerMoved(x, y);
+      view = _menu_view->ActivateEntryAt(x, y);
+
+    if (!view) _indicators->ActivateEntryAt(x, y);
+
+    _menu_view->SetMousePosition(x, y);
+  }
+  else
+  {
+    _menu_view->SetMousePosition(-1, -1);
   }
 }