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

[Albert Astals Cid]

Intellhide behaviour fixes

Launcher is shown after 500 msec of holding the mouse against the edge, hidden after 1000 msec of moving the mouse away and shown if there is no intersecting window

[Michał Sawicz (saviq)]

We'll have to wait for tests for this to land in trunk or implement them here.

review: Abstain

[Albert Astals Cid (aacid)]

There's a test for this at https://code.launchpad.net/~aacid/unity-2d/unity-2d_test_mouse_timing_tests/+merge/88895

[Michał Sawicz (saviq)]

The above assumes we're in intellihide mode, we need a comprehensive set of tests for all the different hiding modes.

[Albert Astals Cid (aacid)]

True, all the tests in that file only work for intellihide

[Michał Sawicz (saviq)]

I'm a bit wary of the "For some reason this requires a Binding, assigning directly to the property won't work in certain cases." comment, but I couldn't find anything wrong functionally.

review: Approve

=== modified file 'shell/launcher/IntelliHideBehavior.qml'
--- shell/launcher/IntelliHideBehavior.qml	2011-12-21 19:03:24 +0000
+++ shell/launcher/IntelliHideBehavior.qml	2012-01-17 16:05:29 +0000
@@ -5,14 +5,20 @@
 BaseBehavior {
     id: intellihide
 
-    property bool shownRegardlessOfFocus: true
+    property bool shownBecauseOfMousePosition: false
 
-    shown: target !== undefined && (target.activeFocus || shownRegardlessOfFocus)
+    shown: target !== undefined && (target.activeFocus || shownBecauseOfMousePosition || !windows.intersects)
 
     Timer {
         id: edgeHitTimer
         interval: 500
-        onTriggered: shownRegardlessOfFocus = true
+        onTriggered: shownBecauseOfMousePosition = true
+    }
+
+    Timer {
+        id: mouseLeaveTimer
+        interval: 1000
+        onTriggered: shownBecauseOfMousePosition = false
     }
 
     Connections {
@@ -21,6 +27,12 @@
         ignoreUnknownSignals: true
     }
 
+    Connections {
+        target: (intellihide.target !== undefined) ? intellihide.target : null
+        onContainsMouseChanged: mouseLeaveTimer.running = !target.containsMouse
+        ignoreUnknownSignals: true
+    }
+
     WindowsIntersectMonitor {
         id: windows
         monitoredArea: intellihide.target ? Qt.rect(0, intellihide.target.y,
@@ -28,12 +40,4 @@
                                                     intellihide.target.height)
                                           : Qt.rect(0, 0, 0, 0)
     }
-
-    /* For some reason this requires a Binding, assigning directly to the property
-       won't work in certain cases. */
-    Binding {
-        target: intellihide
-        property: "shownRegardlessOfFocus"
-        value: intellihide.target ? intellihide.target.containsMouse || !windows.intersects : true
-    }
 }