Merge lp:~saviq/unity-2d/fix-menubar-navigation into lp:unity-2d

[Michał Sawicz]

[panel] only activate menu under cursor if the mouse moved

[Alberto Mardegan (mardy)]

Thanks Michał! Code-wise this looks great!

Unfortunately I cannot test it at the moment -- I'll do that as soon as I'm done working on some Qt issue. :-)
So, it would be great if someone else can verify that the application is indeed functional, and set the review status to "Approved".

review: Approve

[Gerry Boland (gerboland)]

Yes it works great! I've set this to approved.

review: Approve

=== modified file 'libunity-2d-private/src/indicatorsmanager.cpp'
--- libunity-2d-private/src/indicatorsmanager.cpp	2011-09-08 15:00:00 +0000
+++ libunity-2d-private/src/indicatorsmanager.cpp	2011-09-27 14:33:00 +0000
@@ -127,6 +127,14 @@
     // Also, delivers motion events to Qt, which will generate correct
     // enter/leave events for IndicatorEntry widgets.
     QPoint pos = QCursor::pos();
+
+    // Don't send the event unless the mouse has moved
+    // https://bugs.launchpad.net/bugs/834065
+    if (!m_lastMousePosition.isNull() && (m_lastMousePosition == pos)) {
+        return;
+    }
+    m_lastMousePosition = pos;
+
     QWidget* widget = QApplication::widgetAt(pos);
     Display* display = QX11Info::display();
 

=== modified file 'libunity-2d-private/src/indicatorsmanager.h'
--- libunity-2d-private/src/indicatorsmanager.h	2011-08-29 00:47:24 +0000
+++ libunity-2d-private/src/indicatorsmanager.h	2011-09-27 14:33:00 +0000
@@ -26,6 +26,7 @@
 // Qt
 #include <QMap>
 #include <QObject>
+#include <QPoint>
 
 // libunity-core
 #include <UnityCore/DBusIndicators.h>
@@ -63,6 +64,7 @@
     unity::indicator::DBusIndicators::Ptr m_indicators;
     QTimer* m_geometrySyncTimer;
     QTimer* m_mouseTrackerTimer;
+    QPoint m_lastMousePosition;
 
     IndicatorEntryWidgetList m_widgetList;