diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-08-24 08:27:05 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-24 08:27:05 -0400 |
| commit | e86d99acd655815781cd2e23877ce58ab5b24826 (patch) | |
| tree | 5e056a7859751c68c0cfb425fc6f37599c3f7400 /sway/input/seat.c | |
| parent | f53c28d52a6954108592c246c013c0c4b076f09c (diff) | |
| parent | b6058703fa240780d66fac8ef96982c66b2b0263 (diff) | |
Merge pull request #2499 from RyanDwyer/refactor-destroy-functions
Refactor destroy functions and save workspaces when there's no outputs
Diffstat (limited to 'sway/input/seat.c')
| -rw-r--r-- | sway/input/seat.c | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/sway/input/seat.c b/sway/input/seat.c index 4077a8dd..997d7815 100644 --- a/sway/input/seat.c +++ b/sway/input/seat.c @@ -694,13 +694,11 @@ void seat_set_focus_warp(struct sway_seat *seat, // clean up unfocused empty workspace on new output if (new_output_last_ws) { - if (!workspace_is_visible(new_output_last_ws) - && workspace_is_empty(new_output_last_ws)) { - if (last_workspace == new_output_last_ws) { - last_focus = NULL; - last_workspace = NULL; - } - container_destroy(new_output_last_ws); + workspace_consider_destroy(new_output_last_ws); + if (new_output_last_ws->destroying && + last_workspace == new_output_last_ws) { + last_focus = NULL; + last_workspace = NULL; } } @@ -716,12 +714,9 @@ void seat_set_focus_warp(struct sway_seat *seat, if (notify && 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) { - last_focus = NULL; - } - container_destroy(last_workspace); + workspace_consider_destroy(last_workspace); + if (last_workspace->destroying && last_workspace == last_focus) { + last_focus = NULL; } } |