diff options
| author | Ian Fan <ianfan0@gmail.com> | 2018-07-18 21:52:15 +0100 |
|---|---|---|
| committer | Ian Fan <ianfan0@gmail.com> | 2018-08-01 16:57:15 +0100 |
| commit | b2ac234569ff98de583d9e7755526cadf960f772 (patch) | |
| tree | 850c9ca131a2d41efb3ead1968bdb9bb734cef03 | |
| parent | 3edaf2ce2a8a4753c162491329a7dfa492ff7e77 (diff) | |
| download | sway-b2ac234569ff98de583d9e7755526cadf960f772.tar.xz | |
ipc: fix workspace::focus event behaviour
| -rw-r--r-- | sway/input/seat.c | 4 | ||||
| -rw-r--r-- | sway/tree/layout.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sway/input/seat.c b/sway/input/seat.c index c85e9242..76050aa9 100644 --- a/sway/input/seat.c +++ b/sway/input/seat.c @@ -739,7 +739,9 @@ void seat_set_focus_warp(struct sway_seat *seat, if (last_focus) { if (last_workspace) { - ipc_event_workspace(last_workspace, container, "focus"); + if (last_workspace != new_workspace) { + ipc_event_workspace(last_workspace, new_workspace, "focus"); + } if (!workspace_is_visible(last_workspace) && workspace_is_empty(last_workspace)) { if (last_workspace == last_focus) { diff --git a/sway/tree/layout.c b/sway/tree/layout.c index a0f9b6de..9fbbccaf 100644 --- a/sway/tree/layout.c +++ b/sway/tree/layout.c @@ -598,7 +598,7 @@ void container_move(struct sway_container *container, next_ws = container_parent(next_ws, C_WORKSPACE); } if (last_ws && next_ws && last_ws != next_ws) { - ipc_event_workspace(last_ws, container, "focus"); + ipc_event_workspace(last_ws, next_ws, "focus"); workspace_detect_urgent(last_ws); workspace_detect_urgent(next_ws); } |