diff options
author | Brian Ashworth <bosrsf04@gmail.com> | 2018-12-22 11:59:41 -0500 |
---|---|---|
committer | emersion <contact@emersion.fr> | 2018-12-22 18:54:08 +0100 |
commit | cf7c77e56ab895efd3b113debd53fc5881dd7205 (patch) | |
tree | 562a496197417bc093e560303d8b30c30eb91452 /sway/desktop | |
parent | Fixes per wlroots#1441 (diff) | |
download | sway-cf7c77e56ab895efd3b113debd53fc5881dd7205.tar.gz sway-cf7c77e56ab895efd3b113debd53fc5881dd7205.tar.zst sway-cf7c77e56ab895efd3b113debd53fc5881dd7205.zip |
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.c | 2 | ||||
-rw-r--r-- | sway/desktop/render.c | 2 |
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, | |||
108 | }; | 108 | }; |
109 | 109 | ||
110 | struct wlr_box intersection; | 110 | struct wlr_box intersection; |
111 | return wlr_box_intersection(&output_box, &rotated_box, &intersection); | 111 | return wlr_box_intersection(&intersection, &output_box, &rotated_box); |
112 | } | 112 | } |
113 | 113 | ||
114 | static void output_for_each_surface_iterator(struct wlr_surface *surface, | 114 | 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, | |||
261 | }; | 261 | }; |
262 | 262 | ||
263 | struct wlr_box intersection; | 263 | struct wlr_box intersection; |
264 | bool intersects = wlr_box_intersection(&output_box, &box, &intersection); | 264 | bool intersects = wlr_box_intersection(&intersection, &output_box, &box); |
265 | if (!intersects) { | 265 | if (!intersects) { |
266 | return; | 266 | return; |
267 | } | 267 | } |