Merge lp:~osomon/unity-2d/panel-hover-fixes into lp:unity-2d/3.0

[Olivier Tilloy]

[panel] Show the current window’s menu only when the mouse cursor hovers over the appname applet, not the whole panel.

This merge request fixes bug #793403 and bug #793406. Both of them are low importance bugs, but they are a blocker for an OEM project based on Unity-2d, so a review of the fix would be very welcome. Thanks!

[Aurélien Gâteau (agateau)]

Looks good, only suggestion would be to simplify the code checking whether the mouse is over the panel. This line:

  && (geometry().contains(window()->mapFromGlobal(QCursor::pos()))

Can be replaced with:

  && (rect().contains(mapFromGlobal(QCursor::pos()))

Feel free to approve and get it merged after this change is done.

review: Needs Fixing

[lp:~osomon/unity-2d/panel-hover-fixes]

583. By Olivier Tilloy on 2011-06-06

Simplified the code.

=== modified file 'panel/applets/appname/appnameapplet.cpp'
--- panel/applets/appname/appnameapplet.cpp	2011-04-26 15:20:08 +0000
+++ panel/applets/appname/appnameapplet.cpp	2011-06-06 13:12:38 +0000
@@ -221,7 +221,7 @@
     bool isUserVisibleApp = app ? app->user_visible() : false;
     bool isOnSameScreen = d->m_windowHelper->isMostlyOnScreen(QApplication::desktop()->screenNumber(this));
     bool showMenu = (!d->m_menuBarWidget->isEmpty() && isUserVisibleApp && isOnSameScreen)
-        && (window()->geometry().contains(QCursor::pos())
+        && (rect().contains(mapFromGlobal(QCursor::pos()))
         || KeyboardModifiersMonitor::instance()->keyboardModifiers() == Qt::AltModifier
         || d->m_menuBarWidget->isOpened()
         );
@@ -258,26 +258,12 @@
     d->m_menuBarWidget->setVisible(showMenu);
 }
 
-bool AppNameApplet::event(QEvent* event)
-{
-    if (event->type() == QEvent::ParentChange) {
-        // Install an event filter on the panel to detect mouse over
-        window()->installEventFilter(this);
-    }
-    return Applet::event(event);
+void AppNameApplet::enterEvent(QEvent*) {
+    updateWidgets();
 }
 
-bool AppNameApplet::eventFilter(QObject*, QEvent* event)
-{
-    switch (event->type()) {
-    case QEvent::HoverEnter:
-    case QEvent::HoverLeave:
-        updateWidgets();
-        break;
-    default:
-        break;
-    }
-    return false;
+void AppNameApplet::leaveEvent(QEvent*) {
+    updateWidgets();
 }
 
 } // namespace
 
=== modified file 'panel/applets/appname/appnameapplet.h'
--- panel/applets/appname/appnameapplet.h	2011-01-15 01:41:03 +0000
+++ panel/applets/appname/appnameapplet.h	2011-06-06 13:12:38 +0000
@@ -41,8 +41,8 @@
     ~AppNameApplet();
 
 protected:
-    bool event(QEvent*); // reimp
-    bool eventFilter(QObject*, QEvent*); // reimp
+    void enterEvent(QEvent*);
+    void leaveEvent(QEvent*);
 
 private Q_SLOTS:
     void updateWidgets();