diff options
| author | Tony Crisci <tony@dubstepdish.com> | 2018-04-04 00:20:44 -0400 |
|---|---|---|
| committer | Tony Crisci <tony@dubstepdish.com> | 2018-04-04 00:20:44 -0400 |
| commit | 741e3959e30283f5f699f7e9fa6620e3578b9c76 (patch) | |
| tree | 8489f010c2f3e112722e7b999bacef18dfe418ef /sway/config | |
| parent | 9d1cbd77aca72ca72eaba5056de5805b14f004c1 (diff) | |
| parent | 3ea7d2d10ed0d6d68e5bf3dd4efac765eb2b0212 (diff) | |
| download | sway-741e3959e30283f5f699f7e9fa6620e3578b9c76.tar.xz | |
Merge branch 'wlroots' into split-containers2
Diffstat (limited to 'sway/config')
| -rw-r--r-- | sway/config/output.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sway/config/output.c b/sway/config/output.c index c4b74ce2..1c298d37 100644 --- a/sway/config/output.c +++ b/sway/config/output.c @@ -123,11 +123,14 @@ void terminate_swaybg(pid_t pid) { void apply_output_config(struct output_config *oc, struct sway_container *output) { assert(output->type == C_OUTPUT); + struct wlr_output_layout *output_layout = + root_container.sway_root->output_layout; struct wlr_output *wlr_output = output->sway_output->wlr_output; + if (oc && oc->enabled == 0) { + container_destroy(output); wlr_output_layout_remove(root_container.sway_root->output_layout, wlr_output); - container_destroy(output); return; } @@ -148,11 +151,9 @@ void apply_output_config(struct output_config *oc, struct sway_container *output // Find position for it if (oc && (oc->x != -1 || oc->y != -1)) { wlr_log(L_DEBUG, "Set %s position to %d, %d", oc->name, oc->x, oc->y); - wlr_output_layout_add(root_container.sway_root->output_layout, - wlr_output, oc->x, oc->y); + wlr_output_layout_add(output_layout, wlr_output, oc->x, oc->y); } else { - wlr_output_layout_add_auto(root_container.sway_root->output_layout, - wlr_output); + wlr_output_layout_add_auto(output_layout, wlr_output); } if (!oc || !oc->background) { |