diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-08-27 12:32:29 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-27 12:32:29 -0400 |
commit | 9d9de97c4c31b420b337fb7d6878297fcca95562 (patch) | |
tree | 421a57e6b84e493dd506daf4eed354545835ea0e /sway | |
parent | Merge pull request #2519 from ianyfan/set-focus-cleanup (diff) | |
parent | Destroy empty workspaces in output_evacuate (diff) | |
download | sway-9d9de97c4c31b420b337fb7d6878297fcca95562.tar.gz sway-9d9de97c4c31b420b337fb7d6878297fcca95562.tar.zst sway-9d9de97c4c31b420b337fb7d6878297fcca95562.zip |
Merge pull request #2520 from RedSoxFan/destroy-empty-ws-on-evac
Destroy empty workspaces in output_evacuate
Diffstat (limited to 'sway')
-rw-r--r-- | sway/tree/output.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sway/tree/output.c b/sway/tree/output.c index bfc9c723..6601220b 100644 --- a/sway/tree/output.c +++ b/sway/tree/output.c | |||
@@ -128,14 +128,19 @@ static void output_evacuate(struct sway_container *output) { | |||
128 | while (output->children->length) { | 128 | while (output->children->length) { |
129 | struct sway_container *workspace = output->children->items[0]; | 129 | struct sway_container *workspace = output->children->items[0]; |
130 | 130 | ||
131 | container_remove_child(workspace); | ||
132 | |||
133 | if (workspace_is_empty(workspace)) { | ||
134 | workspace_begin_destroy(workspace); | ||
135 | continue; | ||
136 | } | ||
137 | |||
131 | struct sway_container *new_output = | 138 | struct sway_container *new_output = |
132 | workspace_output_get_highest_available(workspace, output); | 139 | workspace_output_get_highest_available(workspace, output); |
133 | if (!new_output) { | 140 | if (!new_output) { |
134 | new_output = fallback_output; | 141 | new_output = fallback_output; |
135 | } | 142 | } |
136 | 143 | ||
137 | container_remove_child(workspace); | ||
138 | |||
139 | if (new_output) { | 144 | if (new_output) { |
140 | workspace_output_add_priority(workspace, new_output); | 145 | workspace_output_add_priority(workspace, new_output); |
141 | container_add_child(new_output, workspace); | 146 | container_add_child(new_output, workspace); |