Unity

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

  1. preprocess-on-icon-count-change
  2. Merge into 7.0
Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: no longer in the source branch.
Merged at revision: 3313
Proposed branch: lp://qastaging/~3v1n0/unity/preprocess-on-icon-count-change
Merge into: lp://qastaging/unity/7.0
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+160354@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

Backport of lp:~3v1n0/unity/preprocess-on-icon-count-change/+merge/160242 to unity 7.0

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
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-7.0-autolanding/3/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-7.0-raring-amd64-autolanding/3
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-7.0-raring-armhf-autolanding/3/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-7.0-raring-i386-autolanding/3

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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

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

review: Needs Fixing (continuous-integration)
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.

Subscribers

People subscribed via source and target branches