mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-26 09:51:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2229 from vilhalmer/destroy-output-destroy-empty-workspaces

Browse source 
Destroy empty workspace when destroying its output
This commit is contained in:
Ryan Dwyer 2018-07-18 10:39:08 +10:00 committed by GitHub
parent 48b911a459 8ce7e3b44e
commit 5903fb4640
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
sway/tree/container.c
View file

@ -199,16 +199,23 @@ static struct sway_container *container_workspace_destroy(
return NULL; return NULL;
} }
// Do not destroy this if it's the last workspace on this output
struct sway_container *output = container_parent(workspace, C_OUTPUT); struct sway_container *output = container_parent(workspace, C_OUTPUT);
if (output && output->children->length == 1) {
// If we're destroying the output, it will be NULL here. Return the root so
// that it doesn't appear that the workspace has refused to be destoyed,
// which would leave it in a broken state with no parent.
if (output == NULL) {
return &root_container;
}
// Do not destroy this if it's the last workspace on this output
if (output->children->length == 1) {
return NULL; return NULL;
} }
wlr_log(WLR_DEBUG, "destroying workspace '%s'", workspace->name); wlr_log(WLR_DEBUG, "destroying workspace '%s'", workspace->name);
struct sway_container *parent = workspace->parent; if (!workspace_is_empty(workspace)) {
if (!workspace_is_empty(workspace) && output) {
// Move children to a different workspace on this output // Move children to a different workspace on this output
struct sway_container *new_workspace = NULL; struct sway_container *new_workspace = NULL;
for (int i = 0; i < output->children->length; i++) { for (int i = 0; i < output->children->length; i++) {
@ -230,7 +237,7 @@ static struct sway_container *container_workspace_destroy(
} }
} }
return parent; return output;
} }
static struct sway_container *container_output_destroy( static struct sway_container *container_output_destroy(