Merge lp://qastaging/~unity-team/unity/launcher-icons-tweaks into lp://qastaging/unity

Proposed by Andrea Cimitan
Status: Merged
Approved by: Andrea Cimitan
Approved revision: no longer in the source branch.
Merged at revision: 1965
Proposed branch: lp://qastaging/~unity-team/unity/launcher-icons-tweaks
Merge into: lp://qastaging/unity
Diff against target: 267 lines (+71/-51)
6 files modified
plugins/unityshell/src/DesktopLauncherIcon.cpp (+0/-12)
plugins/unityshell/src/DesktopLauncherIcon.h (+0/-3)
plugins/unityshell/src/DeviceLauncherIcon.cpp (+0/-10)
plugins/unityshell/src/DeviceLauncherIcon.h (+0/-2)
plugins/unityshell/src/IconRenderer.cpp (+67/-22)
plugins/unityshell/src/Launcher.cpp (+4/-2)
To merge this branch: bzr merge lp://qastaging/~unity-team/unity/launcher-icons-tweaks
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve
Andrea Cimitan (community) Approve
Review via email: mp+92505@code.qastaging.launchpad.net

Description of the change

- Added shadows on launcher icons and alt-tab icons
- Tweaked BFB edges
- Tweaked background tile color for wallpaper-colorized launcher icons (including BFB)
- Added device and show-desktop launcher icons to the list of wallpaper-colorized launcher icons

To post a comment you must log in.
Revision history for this message
Andrea Cimitan (cimi) :
review: Approve (design)
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Code looks good, UI results rock! :)

Revision history for this message
Marco Trevisan (Treviño) (3v1n0) :
review: Approve
Revision history for this message
Unity Merger (unity-merger) wrote :

Attempt to merge into lp:unity failed due to conflicts:

text conflict in plugins/unityshell/src/Launcher.cpp

Revision history for this message
Andrea Cimitan (cimi) wrote :

Fixed conflict

Revision history for this message
Unity Merger (unity-merger) wrote :

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

Revision history for this message
Andrea Cimitan (cimi) :
review: Approve
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) :
review: Approve

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.