diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2023-02-18 00:52:25 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2023-02-18 00:52:25 +0000 |
| commit | c3b796b5b1f46cec16550f1cd0afbc2db10e9415 (patch) | |
| tree | bb987fd8671d442dceab35e1b2badd5d0ffedf23 | |
| parent | 13cd53498bff11c80f993c6aa42db9a066d81fe0 (diff) | |
| parent | 71e2d0c7899e789a4f43c58ec466aaee3f46f57e (diff) | |
| download | pango-c3b796b5b1f46cec16550f1cd0afbc2db10e9415.tar.gz | |
Merge branch 'matthiasc/for-main' into 'main'
cairo: Apply hinting to underlines too
See merge request GNOME/pango!678
| -rw-r--r-- | pango/pango-utils.c | 10 | ||||
| -rw-r--r-- | pango/pangocairo-fcfont.c | 4 |
2 files changed, 8 insertions, 6 deletions
diff --git a/pango/pango-utils.c b/pango/pango-utils.c index 7c85b0aa..a78dcd35 100644 --- a/pango/pango-utils.c +++ b/pango/pango-utils.c @@ -749,9 +749,9 @@ _pango_parse_enum (GType type, s->str); if (possible_values) - *possible_values = s->str; - - g_string_free (s, possible_values ? FALSE : TRUE); + *possible_values = g_string_free (s, FALSE); + else + g_string_free (s, TRUE); } } @@ -811,9 +811,7 @@ pango_parse_flags (GType type, g_string_append (s, v->value_nick); } - *possible_values = s->str; - - g_string_free (s, FALSE); + *possible_values = g_string_free (s, FALSE); } } diff --git a/pango/pangocairo-fcfont.c b/pango/pangocairo-fcfont.c index 4453b5ab..02eefb69 100644 --- a/pango/pangocairo-fcfont.c +++ b/pango/pangocairo-fcfont.c @@ -86,6 +86,10 @@ pango_cairo_fc_font_create_base_metrics_for_context (PangoCairoFont *cfont, metrics->ascent = PANGO_PIXELS_CEIL (metrics->ascent) * PANGO_SCALE; metrics->descent = PANGO_PIXELS_CEIL (metrics->descent) * PANGO_SCALE; metrics->height = PANGO_PIXELS_CEIL (metrics->height) * PANGO_SCALE; + metrics->underline_position = PANGO_PIXELS_CEIL (metrics->underline_position) * PANGO_SCALE; + metrics->underline_thickness = PANGO_PIXELS_CEIL (metrics->underline_thickness) * PANGO_SCALE; + metrics->strikethrough_position = PANGO_PIXELS_CEIL (metrics->strikethrough_position) * PANGO_SCALE; + metrics->strikethrough_thickness = PANGO_PIXELS_CEIL (metrics->strikethrough_thickness) * PANGO_SCALE; } return metrics; |