From cf0eb0339fc53557ab0c3dfc94de167bda33e08d Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Fri, 18 Apr 2014 18:43:26 -0400 Subject: remove ascent from the term structure pango lays out text from the upper left corner rather than from the baseline, so we don't need to track this ourselves anymore --- display.c | 6 ++++-- term.h | 1 - 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/display.c b/display.c index ffed868..eba573f 100644 --- a/display.c +++ b/display.c @@ -385,6 +385,7 @@ static void runes_display_recalculate_font_metrics(RunesTerm *t) PangoFontDescription *desc; PangoContext *context; PangoFontMetrics *metrics; + int ascent, descent; desc = pango_font_description_from_string(t->font_name); @@ -399,8 +400,9 @@ static void runes_display_recalculate_font_metrics(RunesTerm *t) metrics = pango_context_get_metrics(context, desc, NULL); t->fontx = pango_font_metrics_get_approximate_char_width(metrics) / PANGO_SCALE; - t->ascent = pango_font_metrics_get_ascent(metrics) / PANGO_SCALE; - t->fonty = t->ascent + pango_font_metrics_get_descent(metrics) / PANGO_SCALE; + ascent = pango_font_metrics_get_ascent(metrics); + descent = pango_font_metrics_get_descent(metrics); + t->fonty = (ascent + descent) / PANGO_SCALE; pango_font_description_free(desc); if (!t->layout) { diff --git a/term.h b/term.h index a9bd9c2..224103d 100644 --- a/term.h +++ b/term.h @@ -29,7 +29,6 @@ struct runes_term { int ypixel; int fontx; int fonty; - int ascent; char *font_name; PangoLayout *layout; -- cgit v1.2.3-54-g00ecf