blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1044 from emersion/fix-box-intersection 

box: fix wlr_box_intersection
This commit is contained in:
Tony Crisci 2018-06-06 11:59:40 -04:00 committed by GitHub
parent b8202f072c ed89a24328
commit 1a07bf95ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
types/wlr_box.c
View File

@ -46,8 +46,8 @@ bool wlr_box_intersection(const struct wlr_box *box_a,
int x1 = fmax(box_a->x, box_b->x);
int y1 = fmax(box_a->y, box_b->y);
int x2 = fmin(box_a->x + box_a->width - 1, box_b->x + box_b->width - 1);
int y2 = fmin(box_a->y + box_a->height - 1, box_b->y + box_b->height - 1);
int x2 = fmin(box_a->x + box_a->width, box_b->x + box_b->width);
int y2 = fmin(box_a->y + box_a->height, box_b->y + box_b->height);
dest->x = x1;
dest->y = y1;