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

[Albert Astals Cid]

Make IntelliHide inherit from AutoHide and bring fixes up from IntelliHide to AutoHide

[Michał Sawicz (saviq)]

review: Approve

=== modified file 'shell/common/visibilityBehaviors/AutoHideBehavior.qml'
--- shell/common/visibilityBehaviors/AutoHideBehavior.qml	2012-02-20 14:18:31 +0000
+++ shell/common/visibilityBehaviors/AutoHideBehavior.qml	2012-03-02 13:50:24 +0000
@@ -28,9 +28,21 @@
 
 BaseBehavior {
     id: autoHide
+
     property bool shownRegardlessOfFocus: true
-
-    shown: target !== undefined && (target.activeFocus || shownRegardlessOfFocus)
+    property bool autoHideShown: target !== undefined && (target.activeFocus || shownRegardlessOfFocus)
+
+    shown: autoHideShown
+
+    onForcedVisibleChanged:
+    {
+        if (!forcedVisible) {
+            if (!target.containsMouse && forcedVisibleChangeId != "dash") {
+                shownRegardlessOfFocus = true
+                autoHideTimer.restart()
+            }
+        }
+    }
 
     Timer {
         id: autoHideTimer
@@ -48,7 +60,7 @@
     Connections {
         target: (autoHide.target !== undefined) ? autoHide.target : null
         onContainsMouseChanged: {
-            if (target.activeFocus) {
+            if ((shown || forcedVisible) && target.containsMouse) {
                 shownRegardlessOfFocus = true
             }
         }

=== modified file 'shell/common/visibilityBehaviors/IntelliHideBehavior.qml'
--- shell/common/visibilityBehaviors/IntelliHideBehavior.qml	2012-02-08 16:18:21 +0000
+++ shell/common/visibilityBehaviors/IntelliHideBehavior.qml	2012-03-02 13:50:24 +0000
@@ -29,51 +29,12 @@
 //  - containsMouse: Defines if the mouse is inside the target
 //  - outerEdgeContainsMouse: Defines if the mouse is in the edge of the target
 
-BaseBehavior {
+AutoHideBehavior {
     id: intellihide
 
-    property bool shownBecauseOfMousePosition: false
-
-    shown: target !== undefined && (target.activeFocus || shownBecauseOfMousePosition || !windows.intersects)
-
-    onForcedVisibleChanged:
-    {
-        if (!forcedVisible) {
-            if (!target.containsMouse && forcedVisibleChangeId != "dash") {
-                shownBecauseOfMousePosition = true
-                mouseLeaveTimer.restart()
-            }
-        }
-    }
-
-    Timer {
-        id: edgeHitTimer
-        interval: 500
-        onTriggered: shownBecauseOfMousePosition = true
-    }
-
-    Timer {
-        id: mouseLeaveTimer
-        interval: 1000
-        onTriggered: shownBecauseOfMousePosition = false
-    }
-
-    Connections {
-        target: (intellihide.target !== undefined) ? intellihide.target : null
-        onOuterEdgeContainsMouseChanged: edgeHitTimer.running = target.outerEdgeContainsMouse
-        ignoreUnknownSignals: true
-    }
-
-    Connections {
-        target: (intellihide.target !== undefined) ? intellihide.target : null
-        onContainsMouseChanged: {
-            if ((shown || forcedVisible) && target.containsMouse) {
-                shownBecauseOfMousePosition = true
-            }
-            mouseLeaveTimer.running = !target.containsMouse
-        }
-        ignoreUnknownSignals: true
-    }
+    property bool intelliHideShown: autoHideShown || (target !== undefined && !windows.intersects)
+
+    shown: intelliHideShown
 
     WindowsIntersectMonitor {
         id: windows