Unity

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

  1. switcher-icons-progress
  2. Merge into trunk
Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Christopher Townsend
Approved revision: no longer in the source branch.
Merged at revision: 3865
Proposed branch: lp:~3v1n0/unity/switcher-icons-progress
Merge into: lp:unity
Diff against target: 15 lines (+6/-0)
1 file modified
launcher/SwitcherView.cpp (+6/-0)
To merge this branch: bzr merge lp:~3v1n0/unity/switcher-icons-progress
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Christopher Townsend Approve
Review via email: mp+232231@code.launchpad.net

Commit message

SwitcherView: set progress on icon render args

Description of the change

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

To post a comment you must log in.
Revision history for this message
Christopher Townsend (townsend) wrote :

LGTM

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'launcher/SwitcherView.cpp'
2--- launcher/SwitcherView.cpp 2014-07-15 16:28:45 +0000
3+++ launcher/SwitcherView.cpp 2014-08-26 14:28:50 +0000
4@@ -540,6 +540,12 @@
5 arg.backlight_intensity = 0.7f;
6 }
7
8+ if (icon->GetQuirk(AbstractLauncherIcon::Quirk::PROGRESS, monitor))
9+ {
10+ arg.progress_bias = 0.0;
11+ arg.progress = CLAMP(icon->GetProgress(), 0.0f, 1.0f);
12+ }
13+
14 return arg;
15 }
16