Break everything^W^WUse wlr_box for sway_container

2 files changed, 11 insertions, 6 deletions

diff --git a/sway/desktop/desktop.c b/sway/desktop/desktop.c
index 3a13191f..f0a14445 100644
--- a/sway/desktop/desktop.c
+++ b/sway/desktop/desktop.c
@@ -8,7 +8,7 @@ void desktop_damage_whole_surface(struct wlr_surface *surface, double lx,
                 struct sway_container *cont = root_container.children->items[i];
                 if (cont->type == C_OUTPUT) {
                         output_damage_whole_surface(cont->sway_output,
-                                lx - cont->x, ly - cont->y, surface);
+                                lx - cont->box.x, ly - cont->box.y, surface);
                 }
         }
 }
diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index aa18f1b8..49ffe74c 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -192,17 +192,22 @@ static void render_view(struct sway_container *view, void *data) {
                 int window_offset_x = view->sway_view->wlr_xdg_surface_v6->geometry.x;
                 int window_offset_y = view->sway_view->wlr_xdg_surface_v6->geometry.y;
                 render_surface(surface, wlr_output, when,
-                        view->x - window_offset_x, view->y - window_offset_y, 0, alpha);
-                render_xdg_v6_popups(sway_view->wlr_xdg_surface_v6, wlr_output,
-                        when, view->x - window_offset_x, view->y - window_offset_y, 0, alpha);
+                        view->box.x - window_offset_x,
+                        view->box.y - window_offset_y,
+                        0, alpha);
+                render_xdg_v6_popups(sway_view->wlr_xdg_surface_v6, wlr_output, when,
+                        view->box.x - window_offset_x,
+                        view->box.y - window_offset_y,
+                        0, alpha);
                 break;
         }
         case SWAY_VIEW_WL_SHELL:
                 render_wl_shell_surface(sway_view->wlr_wl_shell_surface, wlr_output,
-                        when, view->x, view->y, 0, alpha, false);
+                        when, view->box.x, view->box.y, 0, alpha, false);
                 break;
         case SWAY_VIEW_XWAYLAND:
-                render_surface(surface, wlr_output, when, view->x, view->y, 0, alpha);
+                render_surface(surface, wlr_output, when,
+                                view->box.x, view->box.y, 0, alpha);
                 break;
         }
 }