Merge lp://staging/~aacid/unity-2d/non_sticky_barrier_on_non_activation_side into lp://staging/unity-2d
Proposed by
Albert Astals Cid
| Status: | Merged |
|---|---|
| Approved by: | Albert Astals Cid |
| Approved revision: | 1036 |
| Merged at revision: | 1037 |
| Proposed branch: | lp://staging/~aacid/unity-2d/non_sticky_barrier_on_non_activation_side |
| Merge into: | lp://staging/unity-2d |
| Prerequisite: | lp://staging/~aacid/unity-2d/sticky_edges |
| Diff against target: |
211 lines (+102/-12) 4 files modified
libunity-2d-private/src/pointerbarrier.cpp (+38/-12) libunity-2d-private/src/pointerbarrier.h (+8/-0) libunity-2d-private/tests/pointerbarriertest.cpp (+55/-0) shell/Shell.qml (+1/-0) |
| To merge this branch: | bzr merge lp://staging/~aacid/unity-2d/non_sticky_barrier_on_non_activation_side |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Paweł Stołowski (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Add the triggerOnly property to pointer barriers this way you can make a barrier release itself when the mouse travels the barrier in the non trigger direction
Description of the change
Add the triggerOnly property to pointer barriers this way you can make a barrier release itself when the mouse travels the barrier in the non trigger direction
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 as advertised!