alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2690 from ianyfan/commands

Browse source 
commands: remove obselete code for sticky windows when switching workspace
This commit is contained in:
Ryan Dwyer 2018-09-23 09:52:38 +10:00 committed by GitHub
parent 53b5c4791e 1b32eadbc1
commit ae2055dcf1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sway/tree/workspace.c
View file

@ -389,13 +389,11 @@ bool workspace_switch(struct sway_workspace *workspace,
struct sway_output *next_output = workspace->output; struct sway_output *next_output = workspace->output;
struct sway_workspace *next_output_prev_ws = struct sway_workspace *next_output_prev_ws =
output_get_active_workspace(next_output); output_get_active_workspace(next_output);
bool has_sticky = false;
if (workspace != next_output_prev_ws) { if (workspace != next_output_prev_ws) {
for (int i = 0; i < next_output_prev_ws->floating->length; ++i) { for (int i = 0; i < next_output_prev_ws->floating->length; ++i) {
struct sway_container *floater = struct sway_container *floater =
next_output_prev_ws->floating->items[i]; next_output_prev_ws->floating->items[i];
if (floater->is_sticky) { if (floater->is_sticky) {
has_sticky = true;
container_detach(floater); container_detach(floater);
workspace_add_floating(workspace, floater); workspace_add_floating(workspace, floater);
if (&floater->node == focus) { if (&floater->node == focus) {
@ -414,14 +412,6 @@ bool workspace_switch(struct sway_workspace *workspace,
if (next == NULL) { if (next == NULL) {
next = &workspace->node; 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); seat_set_focus(seat, next);
arrange_workspace(workspace); arrange_workspace(workspace);
cursor_send_pointer_motion(seat->cursor, 0, true); cursor_send_pointer_motion(seat->cursor, 0, true);