diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2022-01-01 01:08:50 -0500 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2022-01-28 09:03:03 -0500 |
| commit | 391ab359be56a707f114afd0b937ee7e5b43ac9c (patch) | |
| tree | 86e508767f28870ff4ffd910338c4d8fdd4b13b0 | |
| parent | ee9b800dfe963d32e9893158c273bd29b0697857 (diff) | |
| download | pango-391ab359be56a707f114afd0b937ee7e5b43ac9c.tar.gz | |
fontset: Add pango_fontset_get_language
This was a missing wrapper for an existing vfunc.
| -rw-r--r-- | pango/pango-context.c | 2 | ||||
| -rw-r--r-- | pango/pango-fontset.c | 28 | ||||
| -rw-r--r-- | pango/pango-fontset.h | 2 |
3 files changed, 26 insertions, 6 deletions
diff --git a/pango/pango-context.c b/pango/pango-context.c index d5e73cfe..e11f067a 100644 --- a/pango/pango-context.c +++ b/pango/pango-context.c @@ -581,7 +581,7 @@ get_first_metrics_foreach (PangoFontset *fontset, gpointer data) { PangoFontMetrics *fontset_metrics = data; - PangoLanguage *language = PANGO_FONTSET_GET_CLASS (fontset)->get_language (fontset); + PangoLanguage *language = pango_fontset_get_language (fontset); PangoFontMetrics *font_metrics = pango_font_get_metrics (font, language); guint save_ref_count; diff --git a/pango/pango-fontset.c b/pango/pango-fontset.c index fc9e05b8..6267fde1 100644 --- a/pango/pango-fontset.c +++ b/pango/pango-fontset.c @@ -58,8 +58,8 @@ pango_fontset_class_init (PangoFontsetClass *class) * Return value: (transfer full): a `PangoFont` */ PangoFont * -pango_fontset_get_font (PangoFontset *fontset, - guint wc) +pango_fontset_get_font (PangoFontset *fontset, + guint wc) { g_return_val_if_fail (PANGO_IS_FONTSET (fontset), NULL); @@ -76,7 +76,7 @@ pango_fontset_get_font (PangoFontset *fontset, * Return value: a `PangoFontMetrics` object */ PangoFontMetrics * -pango_fontset_get_metrics (PangoFontset *fontset) +pango_fontset_get_metrics (PangoFontset *fontset) { g_return_val_if_fail (PANGO_IS_FONTSET (fontset), NULL); @@ -84,6 +84,24 @@ pango_fontset_get_metrics (PangoFontset *fontset) } /** + * pango_fontset_get_language: + * @fontset: a `PangoFontset` + * + * Gets the language that the fontset was created for. + * + * Returns: the language that @fontset was created for + * + * Since: 1.52 + */ +PangoLanguage * +pango_fontset_get_language (PangoFontset *fontset) +{ + g_return_val_if_fail (PANGO_IS_FONTSET (fontset), NULL); + + return PANGO_FONTSET_GET_CLASS (fontset)->get_language (fontset); +} + +/** * pango_fontset_foreach: * @fontset: a `PangoFontset` * @func: (closure data) (scope call): Callback function @@ -113,7 +131,7 @@ get_first_metrics_foreach (PangoFontset *fontset, gpointer data) { PangoFontMetrics *fontset_metrics = data; - PangoLanguage *language = PANGO_FONTSET_GET_CLASS (fontset)->get_language (fontset); + PangoLanguage *language = pango_fontset_get_language (fontset); PangoFontMetrics *font_metrics = pango_font_get_metrics (font, language); guint save_ref_count; @@ -141,7 +159,7 @@ pango_fontset_real_get_metrics (PangoFontset *fontset) PangoFont *font; PangoLanguage *language; - language = PANGO_FONTSET_GET_CLASS (fontset)->get_language (fontset); + language = pango_fontset_get_language (fontset); sample_str = pango_language_get_sample_string (language); count = 0; diff --git a/pango/pango-fontset.h b/pango/pango-fontset.h index 0a222153..e26c19b2 100644 --- a/pango/pango-fontset.h +++ b/pango/pango-fontset.h @@ -127,6 +127,8 @@ PANGO_AVAILABLE_IN_1_4 void pango_fontset_foreach (PangoFontset *fontset, PangoFontsetForeachFunc func, gpointer data); +PANGO_AVAILABLE_IN_1_52 +PangoLanguage * pango_fontset_get_language (PangoFontset *fontset); G_END_DECLS |