Merge branch 'wlroots' into split-containers

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) {
 
         root_container.sway_root = calloc(1, sizeof(*root_container.sway_root));
         root_container.sway_root->output_layout = wlr_output_layout_create();
-        wl_list_init(&root_container.sway_root->unmanaged_views);
+        wl_list_init(&root_container.sway_root->xwayland_unmanaged);
         wl_signal_init(&root_container.sway_root->events.new_container);
 
         root_container.sway_root->output_layout_change.notify =
@@ -288,7 +288,7 @@ void arrange_windows(struct sway_container *container,
                 {
                         container->width = width;
                         container->height = height;
-                        view_set_size(container->sway_view,
+                        view_configure(container->sway_view, container->x, container->y,
                                 container->width, container->height);
                         wlr_log(L_DEBUG, "Set view to %.f x %.f @ %.f, %.f",
                                         container->width, container->height,
@@ -349,8 +349,10 @@ static void apply_horiz_layout(struct sway_container *container,
                         wlr_log(L_DEBUG,
                                 "Calculating arrangement for %p:%d (will scale %f by %f)",
                                 child, child->type, width, scale);
+
                         if (child->type == C_VIEW) {
-                                view_set_position(child->sway_view, child_x, y);
+                                view_configure(child->sway_view, child_x, y, child->width,
+                                        child->height);
                         } else {
                                 child->x = child_x;
                                 child->y = y;
@@ -406,7 +408,8 @@ void apply_vert_layout(struct sway_container *container,
                                 "Calculating arrangement for %p:%d (will scale %f by %f)",
                                 child, child->type, height, scale);
                         if (child->type == C_VIEW) {
-                                view_set_position(child->sway_view, x, child_y);
+                                view_configure(child->sway_view, x, child_y, child->width,
+                                        child->height);
                         } else {
                                 child->x = x;
                                 child->y = child_y;