aboutsummaryrefslogtreecommitdiffstats
path: root/sway
diff options
context:
space:
mode:
authorLibravatar Brian Ashworth <bosrsf04@gmail.com>2018-12-22 11:59:41 -0500
committerLibravatar emersion <contact@emersion.fr>2018-12-22 18:54:08 +0100
commitcf7c77e56ab895efd3b113debd53fc5881dd7205 (patch)
tree562a496197417bc093e560303d8b30c30eb91452 /sway
parentFixes per wlroots#1441 (diff)
downloadsway-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')
-rw-r--r--sway/desktop/output.c2
-rw-r--r--sway/desktop/render.c2
-rw-r--r--sway/tree/container.c2
3 files changed, 3 insertions, 3 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
114static void output_for_each_surface_iterator(struct wlr_surface *surface, 114static 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 }
diff --git a/sway/tree/container.c b/sway/tree/container.c
index b106e0d9..0a96088e 100644
--- a/sway/tree/container.c
+++ b/sway/tree/container.c
@@ -979,7 +979,7 @@ void container_discover_outputs(struct sway_container *con) {
979 output_get_box(output, &output_box); 979 output_get_box(output, &output_box);
980 struct wlr_box intersection; 980 struct wlr_box intersection;
981 bool intersects = 981 bool intersects =
982 wlr_box_intersection(&con_box, &output_box, &intersection); 982 wlr_box_intersection(&intersection, &con_box, &output_box);
983 int index = list_find(con->outputs, output); 983 int index = list_find(con->outputs, output);
984 984
985 if (intersects && index == -1) { 985 if (intersects && index == -1) {