cogl/pango: Take a context as a param when constructing a font map
Avoids using the get_context macro Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3857>
This commit is contained in:
parent
1b5766b5a1
commit
24f46448ce
3 changed files with 10 additions and 8 deletions
|
@ -301,11 +301,15 @@ clutter_context_get_pango_fontmap (ClutterContext *context)
|
|||
CoglPangoFontMap *font_map;
|
||||
gdouble resolution;
|
||||
gboolean use_mipmapping;
|
||||
ClutterBackend *backend;
|
||||
CoglContext *cogl_context;
|
||||
|
||||
if (G_LIKELY (context->font_map != NULL))
|
||||
return context->font_map;
|
||||
|
||||
font_map = COGL_PANGO_FONT_MAP (cogl_pango_font_map_new ());
|
||||
backend = clutter_context_get_backend (context);
|
||||
cogl_context = clutter_backend_get_cogl_context (backend);
|
||||
font_map = COGL_PANGO_FONT_MAP (cogl_pango_font_map_new (cogl_context));
|
||||
|
||||
resolution = clutter_backend_get_resolution (context->backend);
|
||||
cogl_pango_font_map_set_resolution (font_map, resolution);
|
||||
|
|
|
@ -57,13 +57,11 @@ free_priv (gpointer data)
|
|||
}
|
||||
|
||||
PangoFontMap *
|
||||
cogl_pango_font_map_new (void)
|
||||
cogl_pango_font_map_new (CoglContext *context)
|
||||
{
|
||||
PangoFontMap *fm = pango_cairo_font_map_new ();
|
||||
g_autofree CoglPangoFontMapPriv *priv = g_new0 (CoglPangoFontMapPriv, 1);
|
||||
|
||||
_COGL_GET_CONTEXT (context, NULL);
|
||||
|
||||
priv->ctx = g_object_ref (context);
|
||||
|
||||
/* XXX: The public pango api doesn't let us sub-class
|
||||
|
|
|
@ -73,7 +73,7 @@ typedef PangoCairoFontMap CoglPangoFontMap;
|
|||
* Return value: (transfer full): the newly created #PangoFontMap
|
||||
*/
|
||||
COGL_EXPORT PangoFontMap *
|
||||
cogl_pango_font_map_new (void);
|
||||
cogl_pango_font_map_new (CoglContext *context);
|
||||
|
||||
/**
|
||||
* cogl_pango_font_map_create_context:
|
||||
|
|
Loading…
Reference in a new issue