Unity

Merge lp:~3v1n0/unity/edges-loading-draw into lp:unity

  1. edges-loading-draw
  2. Merge into trunk
Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Brandon Schaefer
Approved revision: no longer in the source branch.
Merged at revision: 3232
Proposed branch: lp:~3v1n0/unity/edges-loading-draw
Merge into: lp:unity
Diff against target: 10 lines (+0/-1)
1 file modified
unity-shared/IconRenderer.cpp (+0/-1)
To merge this branch: bzr merge lp:~3v1n0/unity/edges-loading-draw
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Matthieu James (community) design Approve
Brandon Schaefer (community) Approve
Review via email: mp+154154@code.launchpad.net

Commit message

IconRenderer: always colorize the edge_tile, despite the backlight_intensity

Description of the change

The icon edge was not properly colorized when loading an application, this change fixes it.

Before: http://ubuntuone.com/1lAGyeJSzaqrp1ZfQmXg6A
After: http://ubuntuone.com/2qAIMBYHA1FOSIUSCTJMRr

To post a comment you must log in.
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

LGTM.

review: Approve
Revision history for this message
Matthieu James (tiheum) wrote :

It looks good in a design point of view.

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'unity-shared/IconRenderer.cpp'
2--- unity-shared/IconRenderer.cpp 2013-03-18 21:08:39 +0000
3+++ unity-shared/IconRenderer.cpp 2013-03-19 17:25:24 +0000
4@@ -506,7 +506,6 @@
5 force_filter,
6 tile_transform);
7
8- edge_tile_colorify = background_tile_colorify * backlight_intensity;
9 edge_color = edge_color + ((background_tile_color - edge_color) * backlight_intensity);
10 }
11