Merge lp://qastaging/~3v1n0/unity/icon-dragging-cancellation 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: | 2651 |
| Proposed branch: | lp://qastaging/~3v1n0/unity/icon-dragging-cancellation |
| Merge into: | lp://qastaging/unity |
| Diff against target: |
700 lines (+372/-46) 11 files modified
launcher/Launcher.cpp (+47/-24) launcher/Launcher.h (+3/-1) launcher/LauncherDragWindow.cpp (+30/-3) launcher/LauncherDragWindow.h (+8/-2) launcher/LauncherModel.cpp (+35/-0) launcher/LauncherModel.h (+2/-0) launcher/MockLauncherIcon.h (+8/-2) tests/CMakeLists.txt (+1/-0) tests/test_launcher.cpp (+124/-14) tests/test_launcher_drag_window.cpp (+70/-0) tests/test_launcher_model.cpp (+44/-0) |
| To merge this branch: | bzr merge lp://qastaging/~3v1n0/unity/icon-dragging-cancellation |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Brandon Schaefer (community) | Approve | ||
|
Review via email:
|
|||
Commit message
LauncherDragWindow: emit cancelled signal when the Escape key has been pressed during drag
Launcher: restore an icon position after that the dragging has been cancelled
Description of the change
Added drag-n-drop cancellation for the launcher icons: now a LauncherDragWindow grabs the keyboard and emits a signal when the escape key is pressed; at this point the launcher set the dragged icon to its original position. This is done by saving this position when the dragging has begun (thanks to a new utility function I added to the model).
Unit tests added and improved.
To post a comment you must log in.
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
Looks good and works.