Merge lp:~aacid/unity-2d/unity-2d-shell_fix_bfb_toggling into lp:~unity-2d-team/unity-2d/unity-2d-shell

[Albert Astals Cid]

[launcher] Only start the leave timer on visibility change if the mouse is not on the launcher

[Albert Astals Cid (aacid)]

There is a test for this at https://code.launchpad.net/~aacid/unity-2d/unity-2d_test_toggling_bfb_does_not_close_launcher/+merge/89271

[lp:~aacid/unity-2d/unity-2d-shell_fix_bfb_toggling]

921. By Albert Astals Cid on 2012-01-23

merge

[Michał Sawicz (saviq)]

Works fine, code looks good, test works!

review: Approve

=== modified file 'shell/launcher/IntelliHideBehavior.qml'
--- shell/launcher/IntelliHideBehavior.qml	2012-01-18 15:19:04 +0000
+++ shell/launcher/IntelliHideBehavior.qml	2012-01-23 08:52:24 +0000
@@ -12,8 +12,10 @@
     onForcedVisibleChanged:
     {
         if (!forcedVisible) {
-            shownBecauseOfMousePosition = true
-            mouseLeaveTimer.restart()
+            if (!target.containsMouse) {
+                shownBecauseOfMousePosition = true
+                mouseLeaveTimer.restart()
+            }
         }
     }