Unity

Merge lp://qastaging/~3v1n0/unity/preprocess-on-icon-count-change into lp://qastaging/unity

  1. preprocess-on-icon-count-change
  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: 3312
Proposed branch: lp://qastaging/~3v1n0/unity/preprocess-on-icon-count-change
Merge into: lp://qastaging/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://qastaging/~3v1n0/unity/preprocess-on-icon-count-change
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Brandon Schaefer (community) Approve
Review via email: mp+160242@code.qastaging.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.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3314
http://jenkins.qa.ubuntu.com/job/unity-ci/33/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-amd64-ci/33
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-raring-armhf-ci/33/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-i386-ci/33

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

LGTM, i wonder what the CI failure was...

review: Approve
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
The diff is not available at this time. You can reload the page or download it.