diff options
author | Tony Crisci <tony@dubstepdish.com> | 2018-06-06 11:59:40 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-06 11:59:40 -0400 |
commit | 1a07bf95ae430d9709d51a2531b10927f7ae0c44 (patch) | |
tree | 8673f0e1a1d3f1af34cb703d771711b4eb60211c | |
parent | b8202f072cebed6215e7e691c4fb5d90712b95f0 (diff) | |
parent | ed89a2432885d7b6cd403d7f304d3b28ea991410 (diff) |
Merge pull request #1044 from emersion/fix-box-intersection
box: fix wlr_box_intersection
-rw-r--r-- | types/wlr_box.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/types/wlr_box.c b/types/wlr_box.c index f8fe9dfe..ada6a733 100644 --- a/types/wlr_box.c +++ b/types/wlr_box.c @@ -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; |