Don't use wlr_output properties

These properties are before rotation.

4 files changed, 14 insertions, 14 deletions

diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index c182bad6..792a7231 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -98,8 +98,8 @@ static bool get_surface_box(struct surface_iterator_data *data,
         wlr_box_rotated_bounds(&box, data->rotation, &rotated_box);
 
         struct wlr_box output_box = {
-                .width = output->wlr_output->width,
-                .height = output->wlr_output->height,
+                .width = output->width,
+                .height = output->height,
         };
 
         struct wlr_box intersection;
@@ -249,8 +249,8 @@ bool output_has_opaque_overlay_layer_surface(struct sway_output *output) {
                 struct sway_layer_surface *sway_layer_surface =
                         layer_from_wlr_layer_surface(wlr_layer_surface);
                 pixman_box32_t output_box = {
-                        .x2 = output->wlr_output->width,
-                        .y2 = output->wlr_output->height,
+                        .x2 = output->width,
+                        .y2 = output->height,
                 };
                 pixman_region32_t surface_opaque_box;
                 pixman_region32_init(&surface_opaque_box);
diff --git a/sway/desktop/render.c b/sway/desktop/render.c
index 99b2cf3d..9d80f3c7 100644
--- a/sway/desktop/render.c
+++ b/sway/desktop/render.c
@@ -238,8 +238,8 @@ static void render_saved_view(struct sway_view *view,
         };
 
         struct wlr_box output_box = {
-                .width = output->wlr_output->width,
-                .height = output->wlr_output->height,
+                .width = output->width,
+                .height = output->height,
         };
 
         struct wlr_box intersection;
diff --git a/sway/desktop/xdg_shell.c b/sway/desktop/xdg_shell.c
index e19d8e18..575f229d 100644
--- a/sway/desktop/xdg_shell.c
+++ b/sway/desktop/xdg_shell.c
@@ -59,10 +59,10 @@ static void popup_unconstrain(struct sway_xdg_popup *popup) {
         // the output box expressed in the coordinate system of the toplevel parent
         // of the popup
         struct wlr_box output_toplevel_sx_box = {
-                .x = output->wlr_output->lx - view->x,
-                .y = output->wlr_output->ly - view->y,
-                .width = output->wlr_output->width,
-                .height = output->wlr_output->height,
+                .x = output->lx - view->x,
+                .y = output->ly - view->y,
+                .width = output->width,
+                .height = output->height,
         };
 
         wlr_xdg_popup_unconstrain_from_box(wlr_popup, &output_toplevel_sx_box);
diff --git a/sway/desktop/xdg_shell_v6.c b/sway/desktop/xdg_shell_v6.c
index b23d4577..58fbd631 100644
--- a/sway/desktop/xdg_shell_v6.c
+++ b/sway/desktop/xdg_shell_v6.c
@@ -58,10 +58,10 @@ static void popup_unconstrain(struct sway_xdg_popup_v6 *popup) {
         // the output box expressed in the coordinate system of the toplevel parent
         // of the popup
         struct wlr_box output_toplevel_sx_box = {
-                .x = output->wlr_output->lx - view->x,
-                .y = output->wlr_output->ly - view->y,
-                .width = output->wlr_output->width,
-                .height = output->wlr_output->height,
+                .x = output->lx - view->x,
+                .y = output->ly - view->y,
+                .width = output->width,
+                .height = output->height,
         };
 
         wlr_xdg_popup_v6_unconstrain_from_box(wlr_popup, &output_toplevel_sx_box);