Merge lp:~agateau/unity-2d/keep-launcher-when-menu-is-visible into lp:unity-2d/3.0

[Aurélien Gâteau]

[launcher] Fix regression introduced after this branch was merged: visibleChanged() was not emitted reliably.

See https://bugs.launchpad.net/unity-2d/+bug/722713

Fix regression introduced after this branch was merged: visibleChanged() was not emitted reliably.

See https://bugs.launchpad.net/unity-2d/+bug/722713

=== modified file 'launcher/UnityApplications/launchermenu.cpp'
--- launcher/UnityApplications/launchermenu.cpp	2011-03-14 17:17:27 +0000
+++ launcher/UnityApplications/launchermenu.cpp	2011-03-15 10:37:24 +0000
@@ -247,15 +247,14 @@
 }
 
 void
-LauncherContextualMenu::showEvent(QShowEvent* event)
-{
-    QMenu::showEvent(event);
-    visibleChanged(true);
-}
-
-void
-LauncherContextualMenu::hideEvent(QHideEvent* event)
-{
-    QMenu::hideEvent(event);
-    visibleChanged(false);
+LauncherContextualMenu::setVisible(bool value)
+{
+    bool changed = isVisible() != value;
+    // The call to QMenu::setVisible() could probably be skipped if 'changed'
+    // is false, but I'd rather keep the class behavior as close to the default
+    // setVisible() implementation as possible.
+    QMenu::setVisible(value);
+    if (changed) {
+        visibleChanged(value);
+    }
 }

=== modified file 'launcher/UnityApplications/launchermenu.h'
--- launcher/UnityApplications/launchermenu.h	2011-03-14 16:04:14 +0000
+++ launcher/UnityApplications/launchermenu.h	2011-03-15 10:37:24 +0000
@@ -49,6 +49,7 @@
     void setFolded(int folded);
     void setLauncherItem(LauncherItem* launcherItem);
     void setTitle(const QString& title);
+    void setVisible(bool value);
 
     Q_INVOKABLE void show(int x, int y);
     Q_INVOKABLE void hide();
@@ -58,8 +59,6 @@
     void resizeEvent(QResizeEvent* event);
     void leaveEvent(QEvent* event);
     void enterEvent(QEvent* event);
-    void showEvent(QShowEvent* event);
-    void hideEvent(QHideEvent* event);
 
 Q_SIGNALS:
     void foldedChanged(bool);