Merge lp://qastaging/~didrocks/unity/fix-709179-709119 into lp://qastaging/unity
Proposed by
Didier Roche-Tolomelli
| Status: | Merged |
|---|---|
| Merged at revision: | 800 |
| Proposed branch: | lp://qastaging/~didrocks/unity/fix-709179-709119 |
| Merge into: | lp://qastaging/unity |
| Diff against target: |
102 lines (+37/-1) 4 files modified
src/Launcher.cpp (+6/-1) src/Launcher.h (+1/-0) src/LauncherModel.cpp (+28/-0) src/LauncherModel.h (+2/-0) |
| To merge this branch: | bzr merge lp://qastaging/~didrocks/unity/fix-709179-709119 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Jason Smith (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
this branch superseeds ~didrocks/
logic in the icon itself to know if it's draggable or not.
Due to a nux bug in the drag() state not being able to determine which button is
used (nux::GetEventB
the logic has been implemented on LauncherIcon:
LauncherIcon:
the case before.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Putting this into LauncherIcon is not the proper solution. Ideally the policy on dragging would be done in either Launcher or one of its sister classes.
Launcher is also aware of what button was pressed so thats an easy fix there. As for what icons can be dragged, I would suggest maybe in launcher model having a query for model->