Merge lp://qastaging/~mhr3/unity/fix-929506 into lp://qastaging/unity
Proposed by
Michal Hruby
| Status: | Merged |
|---|---|
| Approved by: | Gord Allott |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 2005 |
| Proposed branch: | lp://qastaging/~mhr3/unity/fix-929506 |
| Merge into: | lp://qastaging/unity |
| Diff against target: |
706 lines (+284/-182) 6 files modified
UnityCore/FilesystemLenses.cpp (+225/-166) UnityCore/FilesystemLenses.h (+42/-4) plugins/unityshell/src/BFBLauncherIcon.cpp (+5/-4) plugins/unityshell/src/BFBLauncherIcon.h (+1/-1) tests/data/lenses/files/files.lens (+1/-1) tests/test_filesystem_lenses.cpp (+10/-6) |
| To merge this branch: | bzr merge lp://qastaging/~mhr3/unity/fix-929506 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Gord Allott (community) | Approve | ||
| Mikkel Kamstrup Erlandsen | Pending | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2012-02-21.
Description of the change
Splits out the .lens file reading out of FilesystemLenses class and exposes it in LensDirectoryRe
Un-reverts the revert done in r2001.
The extremely complex part for unity-2d is @ https:/
Covered by existing tests.
To post a comment you must log in.
Revision history for this message
| Michal Hruby (mhr3) wrote | # |
Revision history for this message
| Gord Allott (gordallott) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
I think you need to fix the right click on the bfb in order for this to be acceptable. It is not entirely unlikely that this could be a user's first interaction...