mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-23 06:46:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/wlroots' into swaybar-layers

Browse source
This commit is contained in:
Drew DeVault 2018-03-30 00:02:29 -04:00
commit f26ecd9f58
39 changed files with 618 additions and 589 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sway/config/output.c
View file

@ -120,14 +120,14 @@ void terminate_swaybg(pid_t pid) {
}
}
void apply_output_config(struct output_config *oc, swayc_t *output) {
void apply_output_config(struct output_config *oc, struct sway_container *output) {
assert(output->type == C_OUTPUT);
struct wlr_output *wlr_output = output->sway_output->wlr_output;
if (oc && oc->enabled == 0) {
wlr_output_layout_remove(root_container.sway_root->output_layout,
wlr_output);
destroy_output(output);
container_output_destroy(output);
return;
}