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

[Albert Astals Cid]

[panel] [multi-monitor] Only consider a menubarwidget open if the entry activated belongs to that menubarwidget and not to one in a different screen

Fixes menu item opening in the wrong screen when a window has exact same area on multiple screens.

Only consider a menubarwidget open if the entry activated belongs to that menubarwidget and not to one in a different screen

Fixes menu item opening in the wrong screen when a window is "maximized" over two screens
UNBLOCK

[Unity Merger (unity-merger)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

=== modified file 'libunity-2d-private/src/indicatorentrywidget.cpp'
--- libunity-2d-private/src/indicatorentrywidget.cpp	2012-03-20 10:58:24 +0000
+++ libunity-2d-private/src/indicatorentrywidget.cpp	2012-04-23 16:05:24 +0000
@@ -353,6 +353,11 @@
     m_activatedByThisEntry = true;
 }
 
+bool IndicatorEntryWidget::activatedByThisEntry() const
+{
+    return m_activatedByThisEntry;
+}
+
 void IndicatorEntryWidget::setPadding(int padding)
 {
     if (m_padding != padding) {

=== modified file 'libunity-2d-private/src/indicatorentrywidget.h'
--- libunity-2d-private/src/indicatorentrywidget.h	2012-03-09 14:18:09 +0000
+++ libunity-2d-private/src/indicatorentrywidget.h	2012-04-23 16:05:24 +0000
@@ -61,6 +61,8 @@
      */
     void showMenu(Qt::MouseButton button);
 
+    bool activatedByThisEntry() const;
+
 Q_SIGNALS:
     void isEmptyChanged();
 

=== modified file 'panel/applets/appname/menubarwidget.cpp'
--- panel/applets/appname/menubarwidget.cpp	2012-03-10 02:18:49 +0000
+++ panel/applets/appname/menubarwidget.cpp	2012-04-23 16:05:24 +0000
@@ -165,7 +165,7 @@
     if (!id.empty()) {
         // We only cares about menubar entries
         Q_FOREACH(IndicatorEntryWidget* widget, m_widgetList) {
-            if (widget->entry()->id() == id) {
+            if (widget->entry()->id() == id && widget->activatedByThisEntry()) {
                 isOpened = true;
                 break;
             }

=== modified file 'tests/manual-tests/panel.txt'
--- tests/manual-tests/panel.txt	2012-04-05 09:46:21 +0000
+++ tests/manual-tests/panel.txt	2012-04-23 16:05:24 +0000
@@ -35,3 +35,9 @@
  * Click on the desktop.
  * Verify that desktop menu is available again when mouse is over it.
 ----
+ * Have two monitors of exact same resolution side by side
+ * Have launcher set in autohide mode
+ * Get a firefox window to occupy the total width of the two screens
+ * Open a menu item in the first screen
+ * Verify the menu shows in the first screen and not in the second
+----