Merge lp://qastaging/~mhr3/unity/icon-loader-width-and-height into lp://qastaging/unity
Proposed by
Michal Hruby
| Status: | Merged |
|---|---|
| Approved by: | Omer Akram |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 2690 |
| Proposed branch: | lp://qastaging/~mhr3/unity/icon-loader-width-and-height |
| Merge into: | lp://qastaging/unity |
| Prerequisite: | lp://qastaging/~nick-dedekind/unity/dash-results.focus+size |
| Diff against target: |
1235 lines (+416/-178) 15 files modified
dash/ResultRendererTile.cpp (+11/-17) dash/ResultRendererTile.h (+1/-1) launcher/DeviceNotificationDisplayImp.cpp (+4/-3) plugins/unityshell/resources/emblem_apps.svg (+19/-0) plugins/unityshell/resources/emblem_books.svg (+9/-0) plugins/unityshell/resources/emblem_clothes.svg (+8/-0) plugins/unityshell/resources/emblem_music.svg (+15/-0) plugins/unityshell/resources/emblem_video.svg (+17/-0) tests/test_icon_loader.cpp (+6/-6) unity-shared/CoverArt.cpp (+16/-10) unity-shared/CoverArt.h (+3/-3) unity-shared/IconLoader.cpp (+290/-127) unity-shared/IconLoader.h (+9/-5) unity-shared/IconTexture.cpp (+7/-5) unity-shared/IconTexture.h (+1/-1) |
| To merge this branch: | bzr merge lp://qastaging/~mhr3/unity/icon-loader-width-and-height |
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Omer Akram (community) | Approve | ||
| John Lea (community) | design | Approve | |
| Nick Dedekind (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Change the IconLoader methods to allow specifying both maximum width and height. Updated rendering of the icon ribbons.
Description of the change
Change the IconLoader methods to allow specifying both maximum width and height. Also updated rendering of the icon ribbons.
To post a comment you must log in.
Revision history for this message
| Nick Dedekind (nick-dedekind) wrote | # |
Revision history for this message
| John Lea (johnlea) | # |
review:
Approve
(design)
Revision history for this message
| Unity Merger (unity-merger) wrote | # |
Revision history for this message
| Unity Merger (unity-merger) wrote | # |
Revision history for this message
| Omer Akram (om26er) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
502 + int size = max_height < 0 ? max_width : max_height;
510 + int size = max_height < 0 ? max_width : max_height;
I think it should use the minimum of the values if max_height < 0. so.
int size = max_height < 0 ? max_width : (max_width < 0 ? max_height : MIN(max_height, max_width));
784 switch (category)
785 {
786 + case UNITY_PROTOCOL_
787 + helper_handle =
788 + impl->LoadFromF
789 + break;
790 case UNITY_PROTOCOL_
Could we put the category->resource mapping in the Dash Style?
Other than these the code looks good. I trust it meets visual design requirements :)