From: Matthias Clasen <mclasen@redhat.com>
Date: Fri, 17 Sep 2021 23:11:06 +0000 (-0400)
Subject: Revert "gsk: Stop enlarging text bounding boxes"
X-Git-Tag: archive/raspbian/4.6.5+ds-1+rpi1~1^2~19^2~5^2~333^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=7e4b2b971ff9b3d53c56fd96632e351cff8749bb;p=gtk4.git

Revert "gsk: Stop enlarging text bounding boxes"

This reverts commit 87af45403ace1047b91ddbab98d9d5a5e15b84eb.

I've found that this change is needed to ensure that the
bounding boxes of text nodes encompass all the glyphd drawing.
Without it, we overdraw the widget boundaries and cut off
glyphs.
---

diff --git a/gsk/gskrendernodeimpl.c b/gsk/gskrendernodeimpl.c
index 18cbcd185a..fd2a9e5d44 100644
--- a/gsk/gskrendernodeimpl.c
+++ b/gsk/gskrendernodeimpl.c
@@ -4477,10 +4477,10 @@ gsk_text_node_new (PangoFont              *font,
   self->num_glyphs = n;
 
   graphene_rect_init (&node->bounds,
-                      offset->x + ink_rect.x,
-                      offset->y + ink_rect.y,
-                      ink_rect.width,
-                      ink_rect.height);
+                      offset->x + ink_rect.x - 1,
+                      offset->y + ink_rect.y - 1,
+                      ink_rect.width + 2,
+                      ink_rect.height + 2);
 
   return node;
 }