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

[Albert Astals Cid]

[launcher] Do not hide the launcher immediately after removing an icon

This is a tricky one. this is my observation of the issue:
 * User clicks RMB in a tile
 * User gets the menu
 * We call VisibilityController::beginForceVisible
 * User goes to the menu (i.e. outside of the launcher)
 * User clicks remove from launcher
 * Menu closes
 * We call VisibilityController::endForceVisible
 * This recreates the IntelliHideBehavior that then sees there is something under the panel and hides it

My fix is, after recreating the IntelliHideBehavior if we are coming from the situation that the visibility forcing ended and the mouse cursor is outside the panel, we show the panel and start the 1 second timer, to achieve the same effect on removing items that Unity3D has.

[Gerry Boland (gerboland)]

Until we get automated testing going, I need to ask you to write unit test to test this fix, and place them in https://wiki.ubuntu.com/Unity2DRegressionTests

[Tiago Salem Herrmann (tiagosh)]

looks like a good solution, and the patch looks clean to me.

review: Approve

[Albert Astals Cid (aacid)]

> Until we get automated testing going, I need to ask you to write unit test to
> test this fix, and place them in
> https://wiki.ubuntu.com/Unity2DRegressionTests

Text added to https://wiki.ubuntu.com/Unity2DRegressionTests

[Gerry Boland (gerboland)]

Works real nice, I approve

review: Approve (functional)

=== modified file 'launcher/app/visibilitycontroller.cpp'
--- launcher/app/visibilitycontroller.cpp	2011-11-18 10:15:49 +0000
+++ launcher/app/visibilitycontroller.cpp	2011-11-24 15:36:26 +0000
@@ -54,7 +54,7 @@
 {
 }
 
-void VisibilityController::update()
+void VisibilityController::update(UpdateReason reason)
 {
     if (!m_forceVisibleCountHash.isEmpty()) {
         return;
@@ -76,6 +76,19 @@
             break;
         case IntelliHide:
             setBehavior(new IntelliHideBehavior(m_panel));
+            if (reason == UpdateFromForceVisibilityEnded && !m_panel->geometry().contains(QCursor::pos())) {
+                // The first thing IntelliHideBehavior does is checking if there is
+                // a window behind the panel, and if there is one, hide the panel immediately
+                // This is correct for some cases, but in the case we come from an update because the
+                // panel is not forced visible anymore and the mouse is not in the panel,
+                // i.e. the launcher was visible and the user clicked in an action of the tile menu,
+                // we should still give the user the wait 1 second before hiding behaviour.
+                // To achieve this we tell the behaviour controller to show the panel
+                // and simulate a mouse leave on the panel to start the hiding timer
+                QMetaObject::invokeMethod(m_behavior.data(), "showPanel");
+                QEvent e(QEvent::Leave);
+                QCoreApplication::sendEvent(m_panel, &e);
+            }
             break;
         }
     }
@@ -110,7 +123,7 @@
         UQ_WARNING << "Application" << service << "called endForceVisible() more than beginForceVisible().";
     }
     if (m_forceVisibleCountHash.isEmpty()) {
-        update();
+        update(UpdateFromForceVisibilityEnded);
     }
 }
 
@@ -145,6 +158,6 @@
     m_forceVisibleCountHash.remove(service);
     m_dbusWatcher->removeWatchedService(service);
     if (m_forceVisibleCountHash.isEmpty()) {
-        update();
+        update(UpdateFromForceVisibilityEnded);
     }
 }

=== modified file 'launcher/app/visibilitycontroller.h'
--- launcher/app/visibilitycontroller.h	2011-11-18 10:15:49 +0000
+++ launcher/app/visibilitycontroller.h	2011-11-24 15:36:26 +0000
@@ -62,8 +62,14 @@
     Q_INVOKABLE void beginForceVisible(const QString& service = QString());
     Q_INVOKABLE void endForceVisible(const QString& service = QString());
 
+private:
+    enum UpdateReason {
+        RegularUpdate,
+        UpdateFromForceVisibilityEnded
+    };
+    
 private Q_SLOTS:
-    void update();
+    void update(UpdateReason reason = RegularUpdate);
     void slotServiceUnregistered(const QString&);
     void updatePanelVisibility(bool);