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

[Albert Astals Cid]

[launcher] Bring back revision 803 from lp:unity-2d ([launcher] Do not hide the launcher immediately after removing an icon. Fixes: https://bugs.launchpad.net/bugs/884410.)

The code is different since we've moved to QML since then, but the idea is similar, once the visibility forcing has ended give 1 sec more before hiding the launcher

[Albert Astals Cid (aacid)]

There is a test for that at https://code.launchpad.net/~aacid/unity-2d/unity-2d_test_launcher_hide_delay_on_tile_removal

[lp:~aacid/unity-2d/unity-2d-shell-bring_back_do_not_hide_immediately_after_removing_icon]

914. By Albert Astals Cid on 2012-01-18

Use a variable instead of a function as suggested by Michał

[Michał Sawicz (saviq)]

Please use "target: launcherBehavior.item", otherwise if you change the behavior itself, the binding will break. Can you see if we can get rid of the "when:" after that change? Should work fine when item is the target.

review: Needs Fixing

[lp:~aacid/unity-2d/unity-2d-shell-bring_back_do_not_hide_immediately_after_removing_icon]

915. By Albert Astals Cid on 2012-01-19

merge bzr+ssh://bazaar.launchpad.net/~unity-2d-team/unity-2d/unity-2d-shell/

916. By Albert Astals Cid on 2012-01-19

Target the loader item not the loader as suggested by Michał

[Michał Sawicz (saviq)]

Looks good. And works, too!

review: Approve

=== modified file 'shell/common/BaseBehavior.qml'
--- shell/common/BaseBehavior.qml	2011-11-29 19:24:56 +0000
+++ shell/common/BaseBehavior.qml	2012-01-19 08:20:29 +0000
@@ -3,4 +3,5 @@
 Item {
     property bool shown
     property variant target
+    property bool forcedVisible: false
 }

=== modified file 'shell/launcher/IntelliHideBehavior.qml'
--- shell/launcher/IntelliHideBehavior.qml	2012-01-17 15:55:43 +0000
+++ shell/launcher/IntelliHideBehavior.qml	2012-01-19 08:20:29 +0000
@@ -9,6 +9,14 @@
 
     shown: target !== undefined && (target.activeFocus || shownBecauseOfMousePosition || !windows.intersects)
 
+    onForcedVisibleChanged:
+    {
+        if (!forcedVisible) {
+            shownBecauseOfMousePosition = true
+            mouseLeaveTimer.restart()
+        }
+    }
+
     Timer {
         id: edgeHitTimer
         interval: 500

=== modified file 'shell/launcher/LauncherLoader.qml'
--- shell/launcher/LauncherLoader.qml	2011-12-21 18:42:06 +0000
+++ shell/launcher/LauncherLoader.qml	2012-01-19 08:20:29 +0000
@@ -30,6 +30,12 @@
         when: launcherBehavior.status == Loader.Ready
     }
 
+    Binding {
+        target: launcherBehavior.item
+        property: "forcedVisible"
+        value: visibilityController.forceVisible
+    }
+
     Connections {
         target: declarativeView
         onSuperKeyHeldChanged: {