diff options
| author | Ryan Dwyer <RyanDwyer@users.noreply.github.com> | 2018-09-23 09:52:38 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-23 09:52:38 +1000 |
| commit | ae2055dcf1d389b0acefad4c55cb6030731e9c51 (patch) | |
| tree | 84a7dc1f1ae1b58cf6c0d1d5d0094147cfa59d58 /sway/tree | |
| parent | 53b5c4791e8ad04f3761133005463990eb949ea9 (diff) | |
| parent | 1b32eadbc165f211ed45df2ab0622f730eb40932 (diff) | |
| download | sway-ae2055dcf1d389b0acefad4c55cb6030731e9c51.tar.xz | |
Merge pull request #2690 from ianyfan/commands
commands: remove obselete code for sticky windows when switching workspace
Diffstat (limited to 'sway/tree')
| -rw-r--r-- | sway/tree/workspace.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/sway/tree/workspace.c b/sway/tree/workspace.c index 18746430..b0c440c1 100644 --- a/sway/tree/workspace.c +++ b/sway/tree/workspace.c @@ -389,13 +389,11 @@ bool workspace_switch(struct sway_workspace *workspace, struct sway_output *next_output = workspace->output; struct sway_workspace *next_output_prev_ws = output_get_active_workspace(next_output); - bool has_sticky = false; if (workspace != next_output_prev_ws) { for (int i = 0; i < next_output_prev_ws->floating->length; ++i) { struct sway_container *floater = next_output_prev_ws->floating->items[i]; if (floater->is_sticky) { - has_sticky = true; container_detach(floater); workspace_add_floating(workspace, floater); if (&floater->node == focus) { @@ -414,14 +412,6 @@ bool workspace_switch(struct sway_workspace *workspace, if (next == NULL) { next = &workspace->node; } - if (has_sticky) { - // If there's a sticky container, we might be setting focus to the same - // container that's already focused, so seat_set_focus is effectively a - // no op. We therefore need to send the IPC event and clean up the old - // workspace here. - ipc_event_workspace(active_ws, workspace, "focus"); - workspace_consider_destroy(active_ws); - } seat_set_focus(seat, next); arrange_workspace(workspace); cursor_send_pointer_motion(seat->cursor, 0, true); |