Merge lp://qastaging/~gordallott/unity/dash-remove-maps into lp://qastaging/unity
Proposed by
Gord Allott
| Status: | Merged |
|---|---|
| Approved by: | Neil J. Patel |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 1467 |
| Proposed branch: | lp://qastaging/~gordallott/unity/dash-remove-maps |
| Merge into: | lp://qastaging/unity |
| Diff against target: |
1226 lines (+338/-465) (has conflicts) 9 files modified
plugins/unityshell/src/BGHash.cpp (+0/-2) plugins/unityshell/src/IconLoader.cpp (+60/-26) plugins/unityshell/src/IconLoader.h (+22/-16) plugins/unityshell/src/LensView.cpp (+2/-2) plugins/unityshell/src/ResultRendererHorizontalTile.cpp (+79/-278) plugins/unityshell/src/ResultRendererHorizontalTile.h (+5/-20) plugins/unityshell/src/ResultRendererTile.cpp (+119/-108) plugins/unityshell/src/ResultRendererTile.h (+49/-11) tests/TestResultView.cpp (+2/-2) Text conflict in plugins/unityshell/src/ResultRendererTile.cpp |
| To merge this branch: | bzr merge lp://qastaging/~gordallott/unity/dash-remove-maps |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Neil J. Patel (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
updates the tile rendering to not use any maps at all (hangover from before we had the set_renderer api) - everything is stored in a structure with destructor, destructor's handle the slot disconnection (through api change in IconLoader, which now returns an int handler value)
also horizontal tile has been made a subclass of the normal tile class, cuts down on code duplication
To post a comment you must log in.
Revision history for this message
| Gord Allott (gordallott) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
ignore the conflict, its trunk that is wrong :)