[pango/line-underline] Use ascent for overlines

[Matthias Clasen <matthiasc src gnome org>]

commit 6ccaf00a3b4b587a98f39f079ec14d8644ccc8c3
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat Aug 24 11:35:33 2019 +0200

    Use ascent for overlines

 pango/pango-layout.c   | 4 ++--
 pango/pango-renderer.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/pango/pango-layout.c b/pango/pango-layout.c
index 3fd65f56..469f93c3 100644
--- a/pango/pango-layout.c
+++ b/pango/pango-layout.c
@@ -4951,8 +4951,8 @@ pango_layout_run_get_extents_and_height (PangoLayoutRun *run,
       switch (properties.oline)
        {
        case PANGO_OVERLINE_SINGLE:
-         run_ink->y -= underline_thickness - underline_position;
-         run_ink->height += underline_thickness - underline_position;
+         run_ink->y -= underline_thickness;
+         run_ink->height += underline_thickness;
          break;
        case PANGO_OVERLINE_NONE:
          break;
diff --git a/pango/pango-renderer.c b/pango/pango-renderer.c
index 7f824f32..8180fbf3 100644
--- a/pango/pango-renderer.c
+++ b/pango/pango-renderer.c
@@ -410,9 +410,9 @@ add_overline (PangoRenderer    *renderer,
 {
   PangoRectangle *current_rect = &state->overline_rect;
   PangoRectangle new_rect;
-
   int underline_thickness = pango_font_metrics_get_underline_thickness (metrics);
   int underline_position = pango_font_metrics_get_underline_position (metrics);
+  int ascent = pango_font_metrics_get_ascent (metrics);
 
   new_rect.x = base_x + logical_rect->x;
   new_rect.width = logical_rect->width;
@@ -425,7 +425,7 @@ add_overline (PangoRenderer    *renderer,
       g_assert_not_reached ();
       break;
     case PANGO_OVERLINE_SINGLE:
-      new_rect.y += ink_rect->y - underline_thickness + underline_position;
+      new_rect.y -= ascent + underline_position;
       if (state->overline == renderer->overline)
         {
           new_rect.y = MIN (current_rect->y, new_rect.y);