mirror of
https://github.com/gwenhael-le-moine/sway-patched-tray-menu.git
synced 2024-12-28 22:23:42 +01:00
Merge pull request #1721 from emersion/fix-output-container-coords
Fix wrong output container coordinates
This commit is contained in:
commit
7e2b0d731b
2 changed files with 10 additions and 7 deletions
|
@ -123,11 +123,13 @@ 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) {
|
||||
wlr_output_layout_remove(root_container.sway_root->output_layout,
|
||||
wlr_output);
|
||||
container_output_destroy(output);
|
||||
wlr_output_layout_remove(output_layout, wlr_output);
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -148,11 +150,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) {
|
||||
|
|
|
@ -160,8 +160,11 @@ struct sway_container *container_output_create(
|
|||
return NULL;
|
||||
}
|
||||
|
||||
apply_output_config(oc, output);
|
||||
// Insert the child before applying config so that the container coordinates
|
||||
// get updated
|
||||
container_add_child(&root_container, output);
|
||||
apply_output_config(oc, output);
|
||||
|
||||
load_swaybars();
|
||||
|
||||
// Create workspace
|
||||
|
|
Loading…
Reference in a new issue