Unity

Merge lp://staging/~3v1n0/unity/adaptive-icon-count into lp://staging/unity

  1. adaptive-icon-count
  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: 3862
Proposed branch: lp://staging/~3v1n0/unity/adaptive-icon-count
Merge into: lp://staging/unity
Prerequisite: lp://staging/~3v1n0/unity/icons-emblem-scaling
Diff against target: 283 lines (+54/-41)
6 files modified
launcher/LauncherIcon.cpp (+25/-23)
tests/CMakeLists.txt (+1/-1)
tests/test_main_xless.cpp (+4/-5)
unity-shared/IconRenderer.cpp (+2/-2)
unity-shared/IconTextureSource.cpp (+16/-6)
unity-shared/IconTextureSource.h (+6/-4)
To merge this branch: bzr merge lp://staging/~3v1n0/unity/adaptive-icon-count
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Brandon Schaefer (community) Approve
Review via email: mp+232146@code.staging.launchpad.net

This proposal supersedes a proposal from 2014-08-25.

Commit message

LauncherIcon: make the Icon count width depending on the text value width

Description of the change

LauncherIcon: make the Icon count width depending on the text value width

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3860
http://jenkins.qa.ubuntu.com/job/unity-ci/1069/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/156
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/156/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/156

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

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

LGTM

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

FAILED: Continuous integration, rev:3861
http://jenkins.qa.ubuntu.com/job/unity-ci/1070/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/157
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/157/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/157

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

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

FAILED: Continuous integration, rev:3861
http://jenkins.qa.ubuntu.com/job/unity-ci/1071/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/158
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/158/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/158

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

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

FAILED: Continuous integration, rev:3861
http://jenkins.qa.ubuntu.com/job/unity-ci/1074/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/161/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/161/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/161/console

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

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

FAILED: Continuous integration, rev:3864
http://jenkins.qa.ubuntu.com/job/unity-ci/1076/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/163
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/163/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/163

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

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