Merge lp:~gerboland/unity-2d/launcher-menu-mouse-focus into lp:unity-2d

[Gerry Boland]

[launcher] Have ContextualMenu watch for focusOut event. Fixes bug:877388

[Michał Sawicz (saviq)]

Looks good, does this, by any chance, actually fix bug 817417, too?

review: Approve

[Gerry Boland (gerboland)]

Yes it does actually. Sweet :)

=== modified file 'libunity-2d-private/src/launchermenu.cpp'
--- libunity-2d-private/src/launchermenu.cpp	2011-08-26 08:51:18 +0000
+++ libunity-2d-private/src/launchermenu.cpp	2011-10-19 17:48:48 +0000
@@ -157,6 +157,14 @@
 }
 
 void
+LauncherContextualMenu::focusOutEvent(QFocusEvent* event)
+{
+    /* Hide menu if mouse click outside widget */
+    m_hidingDelayTimer.stop();
+    hide();
+}
+
+void
 LauncherContextualMenu::show(int x, int y)
 {
     m_hidingDelayTimer.stop();
@@ -304,6 +312,7 @@
             break;
         }
     }
+    QMenu::setFocus();
 }
 
 void

=== modified file 'libunity-2d-private/src/launchermenu.h'
--- libunity-2d-private/src/launchermenu.h	2011-07-29 13:49:34 +0000
+++ libunity-2d-private/src/launchermenu.h	2011-10-19 17:48:48 +0000
@@ -62,6 +62,7 @@
     void resizeEvent(QResizeEvent* event);
     void leaveEvent(QEvent* event);
     void enterEvent(QEvent* event);
+    void focusOutEvent(QFocusEvent* event);
     void paintEvent(QPaintEvent* event);
     void keyPressEvent(QKeyEvent* event);