mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-03 09:01:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1040 from acrisci/fix-box-minus-one

Browse source 
fix wlr_box_intersection and closest_point
This commit is contained in:
emersion 2018-06-05 08:46:15 +01:00 • committed by GitHub
commit 7366e1ced9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
types/wlr_box.c
View file

@ -11,8 +11,8 @@ void wlr_box_closest_point(const struct wlr_box *box, double x, double y,
// find the closest x point // find the closest x point
if (x < box->x) { if (x < box->x) {
*dest_x = box->x; *dest_x = box->x;
} else if (x > box->x + box->width) { } else if (x >= box->x + box->width) {
*dest_x = box->x + box->width; *dest_x = box->x + box->width - 1;
} else { } else {
*dest_x = x; *dest_x = x;
} }
@ -20,8 +20,8 @@ void wlr_box_closest_point(const struct wlr_box *box, double x, double y,
// find closest y point // find closest y point
if (y < box->y) { if (y < box->y) {
*dest_y = box->y; *dest_y = box->y;
} else if (y > box->y + box->height) { } else if (y >= box->y + box->height) {
*dest_y = box->y + box->height; *dest_y = box->y + box->height - 1;
} else { } else {
*dest_y = y; *dest_y = y;
} }
@ -46,8 +46,8 @@ bool wlr_box_intersection(const struct wlr_box *box_a,
int x1 = fmax(box_a->x, box_b->x); int x1 = fmax(box_a->x, box_b->x);
int y1 = fmax(box_a->y, box_b->y); int y1 = fmax(box_a->y, box_b->y);
int x2 = fmin(box_a->x + box_a->width, box_b->x + box_b->width); 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, box_b->y + box_b->height); int y2 = fmin(box_a->y + box_a->height - 1, box_b->y + box_b->height - 1);
dest->x = x1; dest->x = x1;
dest->y = y1; dest->y = y1;