Merge lp:~3v1n0/unity/preprocess-on-icon-count-change into lp:unity
Proposed by
Marco Trevisan (Treviño)
Status: | Merged |
---|---|
Approved by: | Brandon Schaefer |
Approved revision: | no longer in the source branch. |
Merged at revision: | 3312 |
Proposed branch: | lp:~3v1n0/unity/preprocess-on-icon-count-change |
Merge into: | lp:unity |
Diff against target: |
99 lines (+26/-8) 4 files modified
launcher/LauncherIcon.cpp (+7/-6) unity-shared/IconRenderer.cpp (+3/-1) unity-shared/IconTextureSource.cpp (+12/-1) unity-shared/IconTextureSource.h (+4/-0) |
To merge this branch: | bzr merge lp:~3v1n0/unity/preprocess-on-icon-count-change |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Approve | |
Brandon Schaefer (community) | Approve | ||
Review via email: mp+160242@code.launchpad.net |
Commit message
IconRenderer: preprocess an icon if its emblem has been shown/hidden
In that way we can update its transformation.
Description of the change
If an icon set/unset its emblem, we should update its transformation, otherwise it won't be drawn or it will be drawn with the wrong transformation.
Proposing against trunk since this won't touch any bit of the 100-scopes branch.
To post a comment you must log in.
FAILED: Continuous integration, rev:3314 jenkins. qa.ubuntu. com/job/ unity-ci/ 33/ jenkins. qa.ubuntu. com/job/ unity-raring- amd64-ci/ 33 jenkins. qa.ubuntu. com/job/ unity-raring- armhf-ci/ 33/console jenkins. qa.ubuntu. com/job/ unity-raring- i386-ci/ 33
http://
Executed test runs:
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins: 8080/job/ unity-ci/ 33/rebuild
http://