diff options
| author | Ian Fan <ianfan0@gmail.com> | 2018-07-18 21:55:14 +0100 |
|---|---|---|
| committer | Ian Fan <ianfan0@gmail.com> | 2018-08-01 16:57:15 +0100 |
| commit | 03eaf444a4a432e5712d40f93d849b51d2028b63 (patch) | |
| tree | ab593f6a5157668ed8515c0af211b7b8c1d37b1c /sway/tree/layout.c | |
| parent | b2ac234569ff98de583d9e7755526cadf960f772 (diff) | |
ipc: prevent emitting a workspace::focus event when moving a container to a different workspace or output
When a container is moved from, say, workspace 1 to workspace 2, workspace 2 is focused in order to arrange the windows before focus is moved back to workspace 1, which caused a workspace:focus event from workspace 2 to workspace 1 to be emitted. This commit inhibits that event.
Diffstat (limited to 'sway/tree/layout.c')
| -rw-r--r-- | sway/tree/layout.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sway/tree/layout.c b/sway/tree/layout.c index 9fbbccaf..1f82e534 100644 --- a/sway/tree/layout.c +++ b/sway/tree/layout.c @@ -1001,13 +1001,13 @@ static void swap_focus(struct sway_container *con1, if (focus == con1 && (con2->parent->layout == L_TABBED || con2->parent->layout == L_STACKED)) { if (workspace_is_visible(ws2)) { - seat_set_focus_warp(seat, con2, false); + seat_set_focus_warp(seat, con2, false, true); } seat_set_focus(seat, ws1 != ws2 ? con2 : con1); } else if (focus == con2 && (con1->parent->layout == L_TABBED || con1->parent->layout == L_STACKED)) { if (workspace_is_visible(ws1)) { - seat_set_focus_warp(seat, con1, false); + seat_set_focus_warp(seat, con1, false, true); } seat_set_focus(seat, ws1 != ws2 ? con1 : con2); } else if (ws1 != ws2) { |