[gtk/glyph-clipping-fixes] gtk-demo: Improve ink extents rendering

[Matthias Clasen <matthiasc src gnome org>]

commit 2c8e55605bbf8809d3d9674a6dc0d684c0312a62
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Sep 17 16:07:51 2021 -0400

    gtk-demo: Improve ink extents rendering
    
    Show the pixel-aligned ink rectangle, so we can
    see that it includes all the pixels that are inked.

 demos/gtk-demo/fontrendering.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/demos/gtk-demo/fontrendering.c b/demos/gtk-demo/fontrendering.c
index 97eff2f597..001b36ca60 100644
--- a/demos/gtk-demo/fontrendering.c
+++ b/demos/gtk-demo/fontrendering.c
@@ -37,7 +37,7 @@ update_image (void)
   const char *text;
   PangoFontDescription *desc;
   PangoLayout *layout;
-  PangoRectangle ink, pink, logical;
+  PangoRectangle ink, logical;
   int baseline;
   cairo_surface_t *surface;
   cairo_t *cr;
@@ -94,7 +94,6 @@ update_image (void)
       pango_layout_set_font_description (layout, desc);
       pango_layout_set_text (layout, text, -1);
       pango_layout_get_extents (layout, &ink, &logical);
-      pink = ink;
       baseline = pango_layout_get_baseline (layout);
 
       pango_extents_to_pixels (&ink, NULL);
@@ -165,10 +164,10 @@ update_image (void)
           cairo_stroke (cr);
           cairo_set_source_rgb (cr, 1, 0, 0);
           cairo_rectangle (cr,
-                           scale * (10 + pango_units_to_double (pink.x)) + 0.5,
-                           scale * (10 + pango_units_to_double (pink.y)) + 0.5,
-                           scale * pango_units_to_double (pink.width) - 1,
-                           scale * pango_units_to_double (pink.height) - 1);
+                           scale * (10 + ink.x) - 0.5,
+                           scale * (10 + ink.y) - 0.5,
+                           scale * ink.width + 1,
+                           scale * ink.height + 1);
           cairo_stroke (cr);
         }