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

[Albert Astals Cid]

[launcher] Start the hide timer if on target animation end the mouse is not over the target

Start the hide timer if on target animation end the mouse is not over the target

[Gerry Boland (gerboland)]

Nice fix approved, thank you

review: Approve

=== modified file 'shell/common/visibilityBehaviors/AutoHideBehavior.qml'
--- shell/common/visibilityBehaviors/AutoHideBehavior.qml	2012-03-06 18:06:03 +0000
+++ shell/common/visibilityBehaviors/AutoHideBehavior.qml	2012-03-30 13:49:20 +0000
@@ -22,8 +22,9 @@
 // in the edge of the target
 // Hides the target when none of the above conditions are met
 // and you have not had the mouse over it during more than 1000 msec
-// To use this Behavior your target needs to provide one properties
+// To use this Behavior your target needs to provide two properties
 //  - containsMouse: Defines if the mouse is inside the target
+//  - animating: Defines if the target is being animated
 // and one signal
 //  - barrierTriggered: Defines when the pointer barrier has been triggered
 
@@ -74,5 +75,11 @@
     Connections {
         target: autoHide.target !== undefined ? autoHide.target : null
         onBarrierTriggered: shownRegardlessOfFocus = true
+        onAnimatingChanged:
+        {
+            if (!target.animating && !target.containsMouse && shownRegardlessOfFocus) {
+                autoHideTimer.start();
+            }
+        }
     }
 }

=== modified file 'shell/common/visibilityBehaviors/IntelliHideBehavior.qml'
--- shell/common/visibilityBehaviors/IntelliHideBehavior.qml	2012-03-12 10:52:13 +0000
+++ shell/common/visibilityBehaviors/IntelliHideBehavior.qml	2012-03-30 13:49:20 +0000
@@ -24,8 +24,9 @@
 // or there are no windows that intersect with the target
 // Hides the target when none of the above conditions are met
 // and you have not had the mouse over it during more than 1000 msec
-// To use this Behavior your target needs to provide one properties
+// To use this Behavior your target needs to provide two properties
 //  - containsMouse: Defines if the mouse is inside the target
+//  - animating: Defines if the target is being animated
 // and one signal
 //  - barrierTriggered: Defines when the pointer barrier has been triggered
 

=== modified file 'shell/launcher/Launcher.qml'
--- shell/launcher/Launcher.qml	2012-03-22 11:08:54 +0000
+++ shell/launcher/Launcher.qml	2012-03-30 13:49:20 +0000
@@ -31,6 +31,8 @@
 
     property bool containsMouse: declarativeView.monitoredAreaContainsMouse
 
+    property bool animating: launcherLoaderXAnimation.running
+
     function hideMenu() {
         if (main.visibleMenu !== undefined) {
             main.visibleMenu.hide()

=== modified file 'tests/launcher/autohide_show_tests.rb'
--- tests/launcher/autohide_show_tests.rb	2012-03-06 18:06:03 +0000
+++ tests/launcher/autohide_show_tests.rb	2012-03-30 13:49:20 +0000
@@ -199,4 +199,8 @@
     test_auto_hide_launcher_hide_timer_and_hud_interaction()
   end
 
+  test "Auto Hide: Launcher mouse move just after barrier trigger" do
+    test_auto_hide_launcher_mouse_move_just_after_barrier_trigger()
+  end
+
 end

=== modified file 'tests/launcher/autohide_show_tests_common.rb'
--- tests/launcher/autohide_show_tests_common.rb	2012-03-06 18:06:03 +0000
+++ tests/launcher/autohide_show_tests_common.rb	2012-03-30 13:49:20 +0000
@@ -619,3 +619,31 @@
     verify_launcher_visible(2)
   }
 end
+
+# Test case objectives:
+# * Auto Hide: Launcher mouse move just after barrier trigger
+# Pre-conditions
+# * Desktop with no running applications
+# Test steps
+# * Set hide-mode to 1
+# * Move mouse away from launcher
+# * Verify Launcher hides
+# * Move mouse to screen edge
+# * Verify Launcher still hiding
+# * Fake a barrier triggering
+# * Move mouse away from the launcher
+# * Verify Launcher hides
+# Post-conditions
+# * None
+# References
+# * https://bugs.launchpad.net/unity-2d/+bug/943296
+def test_auto_hide_launcher_mouse_move_just_after_barrier_trigger
+  $SUT.execute_shell_command 'gsettings set com.canonical.Unity2d.Launcher hide-mode 1'
+  XDo::Mouse.move(300, 300, 0, true)
+  verify_launcher_hidden(TIMEOUT, 'Launcher should not be visible immediately without pushing the edge')
+  move_mouse_to_screen_edge()
+  verify_launcher_hidden(0, 'Launcher should not be visible immediately without pushing the edge')
+  @app.Launcher(:visibleOnScreen  => 'false' ).call_method('barrierTriggered()')
+  XDo::Mouse.move(300, 300, 0, true)
+  verify_launcher_hidden(TIMEOUT, 'Launcher should not be visible after moving the mouse away')
+end

=== modified file 'tests/launcher/autohide_show_tests_rtl.rb'
--- tests/launcher/autohide_show_tests_rtl.rb	2012-03-06 18:06:03 +0000
+++ tests/launcher/autohide_show_tests_rtl.rb	2012-03-30 13:49:20 +0000
@@ -200,4 +200,8 @@
     test_auto_hide_launcher_hide_timer_and_hud_interaction()
   end
 
+  test "Auto Hide: Launcher mouse move just after barrier trigger" do
+    test_auto_hide_launcher_mouse_move_just_after_barrier_trigger()
+  end
+
 end