Merge lp:~azzar1/unity/fix-858469 into lp:unity

[Andrea Azzarone]

Don't jump during launcher keynav.

To reproduce the problem:
1. With a "filled" launcher bar press Alt+F1 (make sure to move your mouse outside of the launcher bar area to not hit bug 858502)
2. Press the down key

RESULT:
* The launcher items jump up and down.

---------------------------------------------------------------

I think this is not the best solution but this is a kind of workaround. Given that we are now at an advanced stage of the release cycle, I think it is better that launcher.cpp does not change too much (Launcher.cpp is not a file, is a puzzle :P )

[Hernando Torque (htorque)]

Tested and works fine.

[Andrea Azzarone (azzar1)]

We should wait that ayatana design team expresses his opinion about bug #858794 becuase this branch deactivate autoscroll during keynav.

[Neil J. Patel (njpatel)]

Works well

review: Approve

=== modified file 'plugins/unityshell/src/Launcher.cpp'
--- plugins/unityshell/src/Launcher.cpp	2011-09-22 17:03:22 +0000
+++ plugins/unityshell/src/Launcher.cpp	2011-09-25 09:25:28 +0000
@@ -1916,7 +1916,7 @@
   Launcher* self = (Launcher*) data;
   nux::Geometry geo = self->GetGeometry();
 
-  if (!self->_hovered || self->GetActionState() == ACTION_DRAG_LAUNCHER)
+  if (self->_keynav_activated || !self->_hovered || self->GetActionState() == ACTION_DRAG_LAUNCHER)
     return TRUE;
 
   if (self->MouseOverTopScrollArea())