Unity

Merge lp:~unity-team/unity/trusty-1361679 into lp:unity/7.2

  1. trusty-1361679
  2. Merge into trusty
Proposed by Stephen M. Webb
Status: Rejected
Rejected by: Stephen M. Webb
Proposed branch: lp:~unity-team/unity/trusty-1361679
Merge into: lp:unity/7.2
Diff against target: 29 lines (+12/-0)
2 files modified
debian/changelog (+6/-0)
launcher/SwitcherView.cpp (+6/-0)
To merge this branch: bzr merge lp:~unity-team/unity/trusty-1361679
Reviewer Review Type Date Requested Status
Unity Team Pending
Review via email: mp+244160@code.launchpad.net

Commit message

SwitcherView: set progress on icon render args

Description of the change

SwitcherView: set progress on icon render args (fixes 1361679).

This change is cherry-picked from trunk for SRUing into Ubuntu 14.04 LTS.

To post a comment you must log in.

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-08-26 13:49:00 +0000
3+++ debian/changelog 2014-12-09 15:32:14 +0000
4@@ -1,3 +1,9 @@
5+unity (7.2.3+14.04.20140826-0ubuntu2) UNRELEASED; urgency=medium
6+
7+ * SwitcherView: set progress on icon render args (lp: #1361679).
8+
9+ -- Marco Trevisan (Treviño) <mail@3v1n0.net> Tue, 09 Dec 2014 10:27:35 -0500
10+
11 unity (7.2.3+14.04.20140826-0ubuntu1) trusty; urgency=medium
12
13 [ Andrea Azzarone ]
14
15=== modified file 'launcher/SwitcherView.cpp'
16--- launcher/SwitcherView.cpp 2014-08-06 14:19:10 +0000
17+++ launcher/SwitcherView.cpp 2014-12-09 15:32:14 +0000
18@@ -540,6 +540,12 @@
19 arg.backlight_intensity = 0.7f;
20 }
21
22+ if (icon->GetQuirk(AbstractLauncherIcon::Quirk::PROGRESS, monitor))
23+ {
24+ arg.progress_bias = 0.0;
25+ arg.progress = CLAMP(icon->GetProgress(), 0.0f, 1.0f);
26+ }
27+
28 return arg;
29 }
30

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: