Merge remote-tracking branch 'upstream/master' into atomic

This commit is contained in:
Ryan Dwyer 2018-06-11 11:03:43 +10:00
commit 9e96cfd310
17 changed files with 507 additions and 41 deletions

View file

@ -26,12 +26,10 @@ static void restore_workspaces(struct sway_container *output) {
j--;
}
}
arrange_output(other);
}
container_sort_workspaces(output);
arrange_output(output);
arrange_and_commit(&root_container);
}
struct sway_container *output_create(
@ -68,6 +66,7 @@ struct sway_container *output_create(
struct sway_container *output = container_create(C_OUTPUT);
output->sway_output = sway_output;
sway_output->swayc = output;
output->name = strdup(name);
if (output->name == NULL) {
container_destroy(output);