Merge lp:~mrasmus/unity/fix-686182 into lp:unity

[Matthew Rasmus]

[Alex Launi (alexlauni)]

A few things.

This breaks the flashing background animation while an application is loading. The background just immediately turns colored.

If an application crashes on startup, it gets marked as running. Granted that we should fix apps so they don't crash on startup, they still do. A good way to test this when you're fixing your patch is to edit /usr/bin/gwibber and add raise RuntimeException before gtk.Main() at the end of the file.

My advice would be to use LAUNCHER_ICON_QUICK_STARTING and do something similar.

Style guidelines say to put a space between method calls and parameters.
  !GetQuirk (LAUNCHER_ICON_QUIRK_RUNNING)
not
  !GetQuirk(LAUNCHER_ICON_QUIRK_RUNNING)

And before we can merge we need you to sign the Canonical contributers agreement: http://www.canonical.com/contributors.

review: Needs Fixing

[Matthew Rasmus (mrasmus)]

Thanks for the advice! I think I've managed to fix the issues you raised, and I sent in my contributer agreement.

[Jason Smith (jassmith)]

Perfect :) Fixed a minor type in review and all looks good

review: Approve

=== modified file 'src/BamfLauncherIcon.cpp'
--- src/BamfLauncherIcon.cpp	2010-12-10 03:15:24 +0000
+++ src/BamfLauncherIcon.cpp	2010-12-10 22:15:11 +0000
@@ -297,9 +297,15 @@
 
   active = bamf_view_is_active (BAMF_VIEW (m_App));
   running = bamf_view_is_running (BAMF_VIEW (m_App));
-
+  
   if (!running)
+  {
+    if (GetQurk (LAUNCHER_ICON_QUIRK_STARTING))
+      return;
+    SetQuirk (LAUNCHER_ICON_QUIRK_STARTING, true);
     OpenInstance ();
+    return;
+  }
   else if (active)
     Spread ();
   else

=== modified file 'src/Launcher.cpp'
--- src/Launcher.cpp	2010-12-10 15:32:43 +0000
+++ src/Launcher.cpp	2010-12-10 22:15:11 +0000
@@ -551,6 +551,12 @@
     int starting_ms = TimeDelta (&current, &starting_time);
     double starting_progress = (double) CLAMP ((float) starting_ms / (float) (ANIM_DURATION_LONG * MAX_STARTING_BLINKS * STARTING_BLINK_LAMBDA * 2), 0.0f, 1.0f);
 
+    if (starting_progress == 1.0f && !icon->GetQuirk (LAUNCHER_ICON_QUIRK_RUNNING))
+    {
+        icon->SetQuirk (LAUNCHER_ICON_QUIRK_STARTING, false);
+        icon->ResetQuirkTime (LAUNCHER_ICON_QUIRK_STARTING);
+    }
+
     return 1.0f - (0.5f + (float) (std::cos (M_PI * (float) (MAX_STARTING_BLINKS * 2) * starting_progress)) * 0.5f);
 }
 
@@ -562,8 +568,11 @@
     float running_progress = CLAMP ((float) running_ms / (float) ANIM_DURATION_SHORT, 0.0f, 1.0f);
 
     // After we finish a fade in from running, we can reset the quirk
-    if (icon->GetQuirk (LAUNCHER_ICON_QUIRK_RUNNING) && running_progress == 1.0f)
-        icon->ResetQuirkTime (LAUNCHER_ICON_QUIRK_STARTING);
+    if (running_progress == 1.0f && icon->GetQuirk (LAUNCHER_ICON_QUIRK_RUNNING))
+    {
+         icon->SetQuirk (LAUNCHER_ICON_QUIRK_STARTING, false);
+         icon->ResetQuirkTime (LAUNCHER_ICON_QUIRK_STARTING);
+    }   
 
     result = IconStartingPulseValue (icon, current) * BACKLIGHT_STRENGTH;