Merge lp:~townsend/unity/fix-lp1246891-trusty into lp:unity/7.2

[Christopher Townsend]

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.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3821
http://jenkins.qa.ubuntu.com/job/unity-7.2-ci/8/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-7.2-trusty-amd64-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-7.2-trusty-armhf-ci/8
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-7.2-trusty-i386-ci/8/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-7.2-ci/8/rebuild

review: Needs Fixing (continuous-integration)

[Stephen M. Webb (bregma)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3821
http://jenkins.qa.ubuntu.com/job/unity-7.2-ci/14/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-7.2-trusty-amd64-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-7.2-trusty-armhf-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-7.2-trusty-i386-ci/14

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-7.2-ci/14/rebuild

review: Approve (continuous-integration)

=== modified file 'launcher/Launcher.cpp'
--- launcher/Launcher.cpp	2014-12-15 19:06:58 +0000
+++ launcher/Launcher.cpp	2015-05-15 19:52:34 +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);