brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

text: Use the resolved text direction

Browse Source 
Now that we compute the effective text direction when creating the Pango
layout, we should also use it when painting it.

https://bugzilla.gnome.org/show_bug.cgi?id=705779
This commit is contained in:
Emmanuele Bassi 2014-03-03 19:16:00 +00:00
parent 50b6b59d02
commit 6faf6dfe42
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
clutter/clutter-text.c
View File

@ -200,6 +200,7 @@ struct _ClutterTextPrivate
guint paint_volume_valid : 1;
guint show_password_hint : 1;
guint password_hint_visible : 1;
guint resolved_direction : 4;
};
enum
@ -550,6 +551,8 @@ clutter_text_create_layout_no_cache (ClutterText *text,
pango_context_set_base_dir (clutter_actor_get_pango_context (CLUTTER_ACTOR (text)), pango_dir);
priv->resolved_direction = pango_dir;
pango_layout_set_text (layout, contents, contents_len);
}
@ -2334,7 +2337,7 @@ clutter_text_paint (ClutterActor *self)
actor_width = alloc_width - 2 * TEXT_PADDING;
text_width = logical_rect.width / PANGO_SCALE;
rtl = clutter_actor_get_text_direction (self) == CLUTTER_TEXT_DIRECTION_RTL;
rtl = priv->resolved_direction == PANGO_DIRECTION_RTL;
if (actor_width < text_width)
{