diff options
author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-06-11 11:03:43 +1000 |
---|---|---|
committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-06-11 11:03:43 +1000 |
commit | 9e96cfd310c4e5dc60f07d772e60b139ff7dc448 (patch) | |
tree | 9961c8705208b2f127133f0533bd305a6f75015e /sway/tree/output.c | |
parent | Refactor everything that needs to arrange windows (diff) | |
parent | Merge pull request #2124 from emersion/drag-icons (diff) | |
download | sway-9e96cfd310c4e5dc60f07d772e60b139ff7dc448.tar.gz sway-9e96cfd310c4e5dc60f07d772e60b139ff7dc448.tar.zst sway-9e96cfd310c4e5dc60f07d772e60b139ff7dc448.zip |
Merge remote-tracking branch 'upstream/master' into atomic
Diffstat (limited to 'sway/tree/output.c')
-rw-r--r-- | sway/tree/output.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sway/tree/output.c b/sway/tree/output.c index ed7e941e..8af319d5 100644 --- a/sway/tree/output.c +++ b/sway/tree/output.c | |||
@@ -26,12 +26,10 @@ static void restore_workspaces(struct sway_container *output) { | |||
26 | j--; | 26 | j--; |
27 | } | 27 | } |
28 | } | 28 | } |
29 | |||
30 | arrange_output(other); | ||
31 | } | 29 | } |
32 | 30 | ||
33 | container_sort_workspaces(output); | 31 | container_sort_workspaces(output); |
34 | arrange_output(output); | 32 | arrange_and_commit(&root_container); |
35 | } | 33 | } |
36 | 34 | ||
37 | struct sway_container *output_create( | 35 | struct sway_container *output_create( |
@@ -68,6 +66,7 @@ struct sway_container *output_create( | |||
68 | 66 | ||
69 | struct sway_container *output = container_create(C_OUTPUT); | 67 | struct sway_container *output = container_create(C_OUTPUT); |
70 | output->sway_output = sway_output; | 68 | output->sway_output = sway_output; |
69 | sway_output->swayc = output; | ||
71 | output->name = strdup(name); | 70 | output->name = strdup(name); |
72 | if (output->name == NULL) { | 71 | if (output->name == NULL) { |
73 | container_destroy(output); | 72 | container_destroy(output); |