isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-23 08:30:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Create the PangoContext of the Text actor

Browse Source 
Instead of creating a single, private PangoContext for every
Text actor, use the newly added clutter_actor_get_pango_context()
function.
This commit is contained in:
Emmanuele Bassi 2008-12-23 14:11:27 +00:00
parent 78628edf2f
commit a865a5d4ea
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
clutter/clutter-text.c
View File

@ -75,9 +75,6 @@
typedef struct _LayoutCache LayoutCache; typedef struct _LayoutCache LayoutCache;
/* Probably move into main */
static PangoContext *_context = NULL;
static const ClutterColor default_cursor_color = { 0, 0, 0, 255 }; static const ClutterColor default_cursor_color = { 0, 0, 0, 255 };
static const ClutterColor default_text_color = { 0, 0, 0, 255 }; static const ClutterColor default_text_color = { 0, 0, 0, 255 };
@ -248,9 +245,11 @@ clutter_text_create_layout_no_cache (ClutterText *text,
ClutterUnit allocation_width) ClutterUnit allocation_width)
{ {
ClutterTextPrivate *priv = text->priv; ClutterTextPrivate *priv = text->priv;
PangoContext *context;
PangoLayout *layout; PangoLayout *layout;
layout = pango_layout_new (_context); context = clutter_actor_get_pango_context (CLUTTER_ACTOR (text));
layout = pango_layout_new (context);
pango_layout_set_font_description (layout, priv->font_desc); pango_layout_set_font_description (layout, priv->font_desc);
@ -1965,9 +1964,6 @@ clutter_text_init (ClutterText *self)
ClutterTextPrivate *priv; ClutterTextPrivate *priv;
int i; int i;
if (G_UNLIKELY (_context == NULL))
_context = _clutter_context_create_pango_context (CLUTTER_CONTEXT ());
self->priv = priv = CLUTTER_TEXT_GET_PRIVATE (self); self->priv = priv = CLUTTER_TEXT_GET_PRIVATE (self);
priv->alignment = PANGO_ALIGN_LEFT; priv->alignment = PANGO_ALIGN_LEFT;