Merge lp:~aacid/unity-2d/fix_xmotionevent_sending into lp:unity-2d

[Albert Astals Cid]

Fix delivery of fake XMotionEvent

The pos/relPos were switched and send relPos based on the outer QWidget not the inner one

[Albert Astals Cid (aacid)]

This should fix the problem in MM with the secondary screen menubar not being activated when the indicators menu is open

[Gerry Boland (gerboland)]

Can you please add a manual test for this please?

[Albert Astals Cid (aacid)]

Manual test added

[lp:~aacid/unity-2d/fix_xmotionevent_sending]

980. By Albert Astals Cid on 2012-03-13

Manual test

=== modified file 'libunity-2d-private/src/indicatorsmanager.cpp'
--- libunity-2d-private/src/indicatorsmanager.cpp	2011-10-14 21:01:28 +0000
+++ libunity-2d-private/src/indicatorsmanager.cpp	2012-03-13 09:09:18 +0000
@@ -145,18 +145,18 @@
     QWidget* widget = QApplication::widgetAt(pos);
     Display* display = QX11Info::display();
 
-    QPoint relPos = widget != 0 ? widget->mapFromGlobal(pos) : pos;
+    QPoint relPos = widget != 0 ? widget->window()->mapFromGlobal(pos) : pos;
     XMotionEvent event = {
         MotionNotify,
         0,
         False,
         display,
-        widget != 0 ? widget->effectiveWinId() : 0,
+        widget != 0 ? widget->window()->effectiveWinId() : 0,
         widget != 0 ? RootWindow(display, widget->x11Info().screen()) : 0,
         0,
         CurrentTime,
+        relPos.x(), relPos.y(),
         pos.x(), pos.y(),
-        relPos.x(), relPos.y(),
         0,
         False,
         True

=== modified file 'tests/manual-tests/panel.txt'
--- tests/manual-tests/panel.txt	2012-02-14 12:43:09 +0000
+++ tests/manual-tests/panel.txt	2012-03-13 09:09:18 +0000
@@ -12,3 +12,11 @@
  * Hit super key to Open Dash.
 
 --> Verify top panel is transparent
+----
+ * Have a two monitor setup in a side by side configuration
+ * Open a program and move its window to the rightmost monitor
+ * Make sure that window is the active one
+ * Click on the indicators in the panel of the rightmost monitor
+ * While the indicators menu is open, move the mouse to the left over the menu area of the rightmost monitor
+
+--> Verify menu appears