Merge lp:~mterry/unity/despread into lp:unity

[Michael Terry]

[Mirco Müller (macslow)]

Approved.

review: Approve

=== modified file 'src/BamfLauncherIcon.cpp'
--- src/BamfLauncherIcon.cpp	2011-02-11 17:03:24 +0000
+++ src/BamfLauncherIcon.cpp	2011-03-14 20:51:46 +0000
@@ -64,13 +64,14 @@
   running = bamf_view_is_running (BAMF_VIEW (m_App));
 
   /* Behaviour:
-   * Nothing running -> launch application
-   * Running and active -> spread application
-   * Spread is active and different icon pressed -> change spread
-   * Spread is active -> Spread de-activated, and fall through
+   * 1) Nothing running -> launch application
+   * 2) Running and active -> spread application
+   * 3) Running and not active -> focus application
+   * 4) Spread is active and different icon pressed -> change spread
+   * 5) Spread is active -> Spread de-activated, and fall through
    */
 
-  if (!running)
+  if (!running) // #1 above
   {
     if (GetQuirk (QUIRK_STARTING))
       return;
@@ -80,18 +81,19 @@
   }
   else if (scaleWasActive)
   {
-    if (!Spread (0, false))
+    if (active ||           // #5 above
+        !Spread (0, false)) // #4 above
     {
       PluginAdapter::Default ()->TerminateScale ();
       Focus ();
       _launcher->SetLastSpreadIcon (NULL);
     }
   }
-  else if (!active)
+  else if (!active) // #3 above
   {
     Focus ();
   }
-  else if (active && !scaleWasActive)
+  else if (active && !scaleWasActive) // #2 above
   {
     Spread (0, false);
   }