Merge lp:~3v1n0/unity/switcher-icons-progress into lp:unity

[Marco Trevisan (Treviño)]

SwitcherView: set progress on icon render args

This was always shown in switcher mockups, but never implemented.

[Christopher Townsend (townsend)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3861
http://jenkins.qa.ubuntu.com/job/unity-ci/1072/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/159
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/159
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/159

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

review: Approve (continuous-integration)

=== modified file 'launcher/SwitcherView.cpp'
--- launcher/SwitcherView.cpp	2014-07-15 16:28:45 +0000
+++ launcher/SwitcherView.cpp	2014-08-26 14:28:50 +0000
@@ -540,6 +540,12 @@
     arg.backlight_intensity = 0.7f;
   }
 
+  if (icon->GetQuirk(AbstractLauncherIcon::Quirk::PROGRESS, monitor))
+  {
+    arg.progress_bias = 0.0;
+    arg.progress = CLAMP(icon->GetProgress(), 0.0f, 1.0f);
+  }
+
   return arg;
 }