From f3fe6b9a4394503f18d1c602768c32ac86b153b0 Mon Sep 17 00:00:00 2001 From: Isaac Freund Date: Wed, 18 Jun 2025 13:30:21 +0200 Subject: [PATCH] util/box: set dest to empty if boxes don't intersect Currently if both box_a and box_b are non-empty but do not intersect, this function does not set dest to an empty box. This contradicts the doc comments and is surprising for users. (cherry picked from commit f5e7caf59994cfa08650cade41374e23779a24a4) --- util/box.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/util/box.c b/util/box.c index 6a6becf33..a9b42579a 100644 --- a/util/box.c +++ b/util/box.c @@ -67,7 +67,12 @@ bool wlr_box_intersection(struct wlr_box *dest, const struct wlr_box *box_a, dest->width = x2 - x1; dest->height = y2 - y1; - return !wlr_box_empty(dest); + if (wlr_box_empty(dest)) { + *dest = (struct wlr_box){0}; + return false; + } + + return true; } bool wlr_box_contains_point(const struct wlr_box *box, double x, double y) {