[gtk/wip/baedert/for-master: 9/13] gl renderer: Fix rounded rect intersection



commit d4c20ac2d9187b81596961773e2971940a1fc1c6
Author: Timm Bäder <mail baedert org>
Date:   Tue Sep 24 06:13:00 2019 +0200

    gl renderer: Fix rounded rect intersection

 gsk/gl/gskglrenderer.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
---
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)
     {


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]