diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-10-20 05:06:03 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-20 05:06:03 +0200 |
commit | 5b8257b88f703f48466f3b917f1ceaee7c457355 (patch) | |
tree | f0d00406e3cb449c2492d6cb8b35a1a57546eebd /sway/tree | |
parent | Merge pull request #2885 from RyanDwyer/fix-tiling-drag-crash (diff) | |
parent | Introduce cursor_rebase (diff) | |
download | sway-5b8257b88f703f48466f3b917f1ceaee7c457355.tar.gz sway-5b8257b88f703f48466f3b917f1ceaee7c457355.tar.zst sway-5b8257b88f703f48466f3b917f1ceaee7c457355.zip |
Merge pull request #2872 from RyanDwyer/cursor-rebase
Introduce cursor_rebase
Diffstat (limited to 'sway/tree')
-rw-r--r-- | sway/tree/view.c | 3 | ||||
-rw-r--r-- | sway/tree/workspace.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/sway/tree/view.c b/sway/tree/view.c index 85998547..43a9d510 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c | |||
@@ -653,9 +653,8 @@ void view_unmap(struct sway_view *view) { | |||
653 | } else if (node && node->type == N_WORKSPACE) { | 653 | } else if (node && node->type == N_WORKSPACE) { |
654 | cursor_warp_to_workspace(seat->cursor, node->sway_workspace); | 654 | cursor_warp_to_workspace(seat->cursor, node->sway_workspace); |
655 | } | 655 | } |
656 | } else { | ||
657 | cursor_send_pointer_motion(seat->cursor, 0, true); | ||
658 | } | 656 | } |
657 | cursor_rebase(seat->cursor); | ||
659 | } | 658 | } |
660 | 659 | ||
661 | transaction_commit_dirty(); | 660 | transaction_commit_dirty(); |
diff --git a/sway/tree/workspace.c b/sway/tree/workspace.c index a1282c1e..2a00824d 100644 --- a/sway/tree/workspace.c +++ b/sway/tree/workspace.c | |||
@@ -399,7 +399,7 @@ bool workspace_switch(struct sway_workspace *workspace, | |||
399 | } | 399 | } |
400 | seat_set_focus(seat, next); | 400 | seat_set_focus(seat, next); |
401 | arrange_workspace(workspace); | 401 | arrange_workspace(workspace); |
402 | cursor_send_pointer_motion(seat->cursor, 0, true); | 402 | cursor_rebase(seat->cursor); |
403 | return true; | 403 | return true; |
404 | } | 404 | } |
405 | 405 | ||