aboutsummaryrefslogtreecommitdiff
path: root/sway/desktop
diff options
context:
space:
mode:
authorBrian Ashworth <bosrsf04@gmail.com>2018-12-22 11:59:41 -0500
committeremersion <contact@emersion.fr>2018-12-22 18:54:08 +0100
commitcf7c77e56ab895efd3b113debd53fc5881dd7205 (patch)
tree562a496197417bc093e560303d8b30c30eb91452 /sway/desktop
parent788b715776b6d8c1ed3c67929a17a4d0d4079458 (diff)
downloadsway-cf7c77e56ab895efd3b113debd53fc5881dd7205.tar.xz
Fix wlr_box_intersection args for wlroots 1441
The fix pushed to master missed wlr_box_intersection. This just fixes those lines so sway renders properly again
Diffstat (limited to 'sway/desktop')
-rw-r--r--sway/desktop/output.c2
-rw-r--r--sway/desktop/render.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index ed504bdf..79ad7faa 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -108,7 +108,7 @@ static bool get_surface_box(struct surface_iterator_data *data,
};
struct wlr_box intersection;
- return wlr_box_intersection(&output_box, &rotated_box, &intersection);
+ return wlr_box_intersection(&intersection, &output_box, &rotated_box);
}
static void output_for_each_surface_iterator(struct wlr_surface *surface,
diff --git a/sway/desktop/render.c b/sway/desktop/render.c
index 1260d85a..14881e96 100644
--- a/sway/desktop/render.c
+++ b/sway/desktop/render.c
@@ -261,7 +261,7 @@ static void render_saved_view(struct sway_view *view,
};
struct wlr_box intersection;
- bool intersects = wlr_box_intersection(&output_box, &box, &intersection);
+ bool intersects = wlr_box_intersection(&intersection, &output_box, &box);
if (!intersects) {
return;
}