From: Timm Bäder Date: Tue, 24 Sep 2019 04:13:00 +0000 (+0200) Subject: gl renderer: Fix rounded rect intersection X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~20^2~832 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e05b87c8d0774d33af4f6d18d2d43382cd1bd25e;p=gtk4.git gl renderer: Fix rounded rect intersection --- diff --git a/gsk/gl/gskglrenderer.c b/gsk/gl/gskglrenderer.c index b424cc1f60..fb4ecdefe0 100644 --- a/gsk/gl/gskglrenderer.c +++ b/gsk/gl/gskglrenderer.c @@ -1164,13 +1164,13 @@ gsk_rounded_rect_intersection (const GskRoundedRect *outer, get_inner_rect (inner, &inner_inner); - contained_x = outer_inner.origin.x <= inner_inner.origin.x && - (outer_inner.origin.x + outer_inner.size.width) > (inner_inner.origin.x + - inner_inner.size.width); + contained_x = outer_inner.origin.x <= inner_bounds->origin.x && + (outer_inner.origin.x + outer_inner.size.width) > (inner_bounds->origin.x + + inner_bounds->size.width); - contained_y = outer_inner.origin.y <= inner_inner.origin.y && - (outer_inner.origin.y + outer_inner.size.height) > (inner_inner.origin.y + - inner_inner.size.height); + contained_y = outer_inner.origin.y <= inner_bounds->origin.y && + (outer_inner.origin.y + outer_inner.size.height) > (inner_bounds->origin.y + + inner_bounds->size.height); if (contained_x && !contained_y) {