Merge lp:~townsend/unity/fix-quicklist-spread into lp:unity

[Christopher Townsend]

Wait on Spread to be terminated before showing the Quicklist.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3955
http://jenkins.qa.ubuntu.com/job/unity-ci/1205/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-amd64-ci/93
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-armhf-ci/92
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-i386-ci/93

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

review: Approve (continuous-integration)

[Marco Trevisan (Treviño) (3v1n0)]

Right...

review: Approve

=== modified file 'launcher/LauncherIcon.cpp'
--- launcher/LauncherIcon.cpp	2015-03-20 16:23:04 +0000
+++ launcher/LauncherIcon.cpp	2015-04-23 20:19:52 +0000
@@ -577,10 +577,6 @@
   }
 
   WindowManager& win_manager = WindowManager::Default();
-
-  if (win_manager.IsScaleActive())
-    win_manager.TerminateScale();
-
   auto const& pos = GetTipPosition(monitor);
 
   /* If the expo plugin is active, we need to wait it to be terminated, before
@@ -593,6 +589,15 @@
       conn->disconnect();
     });
   }
+  else if (win_manager.IsScaleActive())
+  {
+    auto conn = std::make_shared<sigc::connection>();
+    *conn = win_manager.terminate_spread.connect([this, conn, pos, restore_input_focus] {
+      QuicklistManager::Default()->ShowQuicklist(_quicklist, pos.x, pos.y, restore_input_focus);
+      conn->disconnect();
+    });
+    win_manager.TerminateScale();
+  }
   else
   {
     QuicklistManager::Default()->ShowQuicklist(_quicklist, pos.x, pos.y, restore_input_focus);