Merge lp://qastaging/~3v1n0/unity/hud-icon-type into lp://qastaging/unity
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: | 2189 |
| Proposed branch: | lp://qastaging/~3v1n0/unity/hud-icon-type |
| Merge into: | lp://qastaging/unity |
| Prerequisite: | lp://qastaging/~3v1n0/unity/hud-lock-out-monitors-tests |
| Diff against target: |
143 lines (+36/-13) 5 files modified
plugins/unityshell/src/AbstractLauncherIcon.h (+1/-0) plugins/unityshell/src/BFBLauncherIcon.cpp (+11/-5) plugins/unityshell/src/HudLauncherIcon.cpp (+3/-2) plugins/unityshell/src/Launcher.cpp (+18/-6) tests/autopilot/autopilot/tests/test_hud.py (+3/-0) |
| To merge this branch: | bzr merge lp://qastaging/~3v1n0/unity/hud-icon-type |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Gord Allott (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Added HUD_TYPE for Icons, this allow to draw the active triangle on that only (and not on BFB).
Description of the change
Added HUD_TYPE for Icons, this allow to draw the active triangle on that only (and not on BFB).
AP tests updated to check this too.
To post a comment you must log in.
Revision history for this message
| Gord Allott (gordallott) | # |
review:
Approve
Revision history for this message
| Unity Merger (unity-merger) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Attempt to merge into lp:unity failed due to conflicts:
text conflict in tests/autopilot