Merge lp:~townsend/unity/fix-keynav-scroll into lp:unity

[Christopher Townsend]

Fixes issue where entering keynav mode may make the BFB icon scroll off the top of the Launcher.

= Issue =
If there are many icons in the Launcher leading to the concertina effect and entering keynav mode, a condition may occur where the BFB icon may scroll off the top of the Launcher (see bug #1068166). This issue has recently led to AP test failures and actually causing the AP test run to get stuck (see bug #1219636).

= Fix =
When setting the hover, do not set the _enter_y variable if in KeyNav Mode. This variable is used to determine if the Launcher should scroll when hover is set.

= Test =
Running autopilot run --verbose unity.tests.test_quicklist.QuicklistActionTests.test_right_click_opens_quicklist_if_already_open unity.tests.launcher.test_keynav.LauncherKeyNavTests.test_launcher_keynav_cancel_on_quicklist_activate is sufficient to test this.

[Stephen M. Webb (bregma)]

Funny how one little change can have such big results.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3490
http://jenkins.qa.ubuntu.com/job/unity-ci/329/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/218
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/216
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/217

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-ci/329/rebuild

review: Approve (continuous-integration)

=== modified file 'launcher/Launcher.cpp'
--- launcher/Launcher.cpp	2013-08-28 16:14:20 +0000
+++ launcher/Launcher.cpp	2013-09-05 13:16:49 +0000
@@ -1496,7 +1496,7 @@
 
   _hovered = hovered;
 
-  if (_hovered)
+  if (!IsInKeyNavMode() && _hovered)
   {
     _enter_y = (int) _mouse_position.y;
     TimeUtil::SetTimeStruct(&_times[TIME_ENTER], &_times[TIME_LEAVE], ANIM_DURATION);