Merge lp:~brandontschaefer/unity/fix-1246891 into lp:unity

[Brandon Schaefer]

When we quit the quicklist it would check if the mouse was over the launcher, if it wasn't it would fold the launcher. We don't need to check this if we are in keynav as we want all the icons to be unfolded.

When we quit the quicklist it would check if the mouse was over the launcher, if it wasnt it would fold the launcher. We dont need to check this if we are in keynav as we want all the icons to be unfolded.

[Christopher Townsend (townsend)]

LGTM

review: Approve

=== modified file 'launcher/Launcher.cpp'
--- launcher/Launcher.cpp	2014-12-12 22:33:24 +0000
+++ launcher/Launcher.cpp	2015-03-13 17:51:05 +0000
@@ -2308,13 +2308,17 @@
 
 void Launcher::RecvQuicklistClosed(nux::ObjectPtr<QuicklistView> const& quicklist)
 {
-  nux::Point pt = nux::GetWindowCompositor().GetMousePosition();
-  if (!GetAbsoluteGeometry().IsInside(pt))
+  if (!IsInKeyNavMode())
   {
-    // The Quicklist just closed and the mouse is outside the launcher.
-    SetHover(false);
-    SetStateMouseOverLauncher(false);
+    nux::Point pt = nux::GetWindowCompositor().GetMousePosition();
+    if (!GetAbsoluteGeometry().IsInside(pt))
+    {
+      // The Quicklist just closed and the mouse is outside the launcher.
+      SetHover(false);
+      SetStateMouseOverLauncher(false);
+    }
   }
+
   // Cancel any prior state that was set before the Quicklist appeared.
   SetActionState(ACTION_NONE);