diff options
Diffstat (limited to 'sway/tree/layout.c')
-rw-r--r-- | sway/tree/layout.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sway/tree/layout.c b/sway/tree/layout.c index 88463e3b..95a84d12 100644 --- a/sway/tree/layout.c +++ b/sway/tree/layout.c | |||
@@ -58,7 +58,7 @@ void layout_init(void) { | |||
58 | 58 | ||
59 | root_container.sway_root = calloc(1, sizeof(*root_container.sway_root)); | 59 | root_container.sway_root = calloc(1, sizeof(*root_container.sway_root)); |
60 | root_container.sway_root->output_layout = wlr_output_layout_create(); | 60 | root_container.sway_root->output_layout = wlr_output_layout_create(); |
61 | wl_list_init(&root_container.sway_root->unmanaged_views); | 61 | wl_list_init(&root_container.sway_root->xwayland_unmanaged); |
62 | wl_signal_init(&root_container.sway_root->events.new_container); | 62 | wl_signal_init(&root_container.sway_root->events.new_container); |
63 | 63 | ||
64 | root_container.sway_root->output_layout_change.notify = | 64 | root_container.sway_root->output_layout_change.notify = |
@@ -288,7 +288,7 @@ void arrange_windows(struct sway_container *container, | |||
288 | { | 288 | { |
289 | container->width = width; | 289 | container->width = width; |
290 | container->height = height; | 290 | container->height = height; |
291 | view_set_size(container->sway_view, | 291 | view_configure(container->sway_view, container->x, container->y, |
292 | container->width, container->height); | 292 | container->width, container->height); |
293 | wlr_log(L_DEBUG, "Set view to %.f x %.f @ %.f, %.f", | 293 | wlr_log(L_DEBUG, "Set view to %.f x %.f @ %.f, %.f", |
294 | container->width, container->height, | 294 | container->width, container->height, |
@@ -349,8 +349,10 @@ static void apply_horiz_layout(struct sway_container *container, | |||
349 | wlr_log(L_DEBUG, | 349 | wlr_log(L_DEBUG, |
350 | "Calculating arrangement for %p:%d (will scale %f by %f)", | 350 | "Calculating arrangement for %p:%d (will scale %f by %f)", |
351 | child, child->type, width, scale); | 351 | child, child->type, width, scale); |
352 | |||
352 | if (child->type == C_VIEW) { | 353 | if (child->type == C_VIEW) { |
353 | view_set_position(child->sway_view, child_x, y); | 354 | view_configure(child->sway_view, child_x, y, child->width, |
355 | child->height); | ||
354 | } else { | 356 | } else { |
355 | child->x = child_x; | 357 | child->x = child_x; |
356 | child->y = y; | 358 | child->y = y; |
@@ -406,7 +408,8 @@ void apply_vert_layout(struct sway_container *container, | |||
406 | "Calculating arrangement for %p:%d (will scale %f by %f)", | 408 | "Calculating arrangement for %p:%d (will scale %f by %f)", |
407 | child, child->type, height, scale); | 409 | child, child->type, height, scale); |
408 | if (child->type == C_VIEW) { | 410 | if (child->type == C_VIEW) { |
409 | view_set_position(child->sway_view, x, child_y); | 411 | view_configure(child->sway_view, x, child_y, child->width, |
412 | child->height); | ||
410 | } else { | 413 | } else { |
411 | child->x = x; | 414 | child->x = x; |
412 | child->y = child_y; | 415 | child->y = child_y; |