alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix wlr_box_intersection args for wlroots 1441

Browse source 
The fix pushed to master missed wlr_box_intersection. This just fixes
those lines so sway renders properly again
This commit is contained in:
Brian Ashworth 2018-12-22 11:59:41 -05:00 committed by emersion
parent 788b715776
commit cf7c77e56a
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sway/desktop/output.c
View file

@ -108,7 +108,7 @@ static bool get_surface_box(struct surface_iterator_data *data,
}; };
struct wlr_box intersection; 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, static void output_for_each_surface_iterator(struct wlr_surface *surface,

2
sway/desktop/render.c
View file

@ -261,7 +261,7 @@ static void render_saved_view(struct sway_view *view,
}; };
struct wlr_box intersection; struct wlr_box intersection;
bool intersects = wlr_box_intersection(&output_box, &box, &intersection); bool intersects = wlr_box_intersection(&intersection, &output_box, &box);
if (!intersects) { if (!intersects) {
return; return;
} }

2
sway/tree/container.c
View file

@ -979,7 +979,7 @@ void container_discover_outputs(struct sway_container *con) {
output_get_box(output, &output_box); output_get_box(output, &output_box);
struct wlr_box intersection; struct wlr_box intersection;
bool intersects = bool intersects =
wlr_box_intersection(&con_box, &output_box, &intersection); wlr_box_intersection(&intersection, &con_box, &output_box);
int index = list_find(con->outputs, output); int index = list_find(con->outputs, output);
if (intersects && index == -1) { if (intersects && index == -1) {