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

2008-06-24 Emmanuele Bassi <ebassi@openedhand.com>

Browse Source 
* clutter/clutter-entry.c:
	(clutter_entry_ensure_layout): Convert the invisible char
	to UTF-8 to avoid Pango barfing on us.
This commit is contained in:
Emmanuele Bassi 2008-06-24 10:40:58 +00:00
parent a692421945
commit 9bc15bb467
2 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ChangeLog
View File

@ -1,9 +1,15 @@
2008-06-24 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/clutter-entry.c:
(clutter_entry_ensure_layout): Convert the invisible char
to UTF-8 to avoid Pango barfing on us.
2008-06-24 Matthew Allum <mallum@openedhand.com> 2008-06-24 Matthew Allum <mallum@openedhand.com>
* clutter/eglnative/clutter-stage-egl.c: * clutter/eglnative/clutter-stage-egl.c:
Add an extra debug note. Add an extra debug note.
* configure.ac: * configure.ac:
Generate version.xml for COGL API docs Generate version.xml for COGL API docs
2008-06-24 Chris Lord <chris@openedhand.com> 2008-06-24 Chris Lord <chris@openedhand.com>
@ -28,17 +34,17 @@
2008-06-23 Matthew Allum <mallum@openedhand.com> 2008-06-23 Matthew Allum <mallum@openedhand.com>
* NEWS: * NEWS:
Add a quick note on fruity multiple deivce support. Add a quick note on fruity multiple deivce support.
* README: * README:
Add multiple device support details and some tweaks on Add multiple device support details and some tweaks on
Clutter requirements (i.e GdkPixbuf). Clutter requirements (i.e GdkPixbuf).
2008-06-23 Matthew Allum <mallum@openedhand.com> 2008-06-23 Matthew Allum <mallum@openedhand.com>
Bug 987 - clutter-event.c c99 variable declaration Bug 987 - clutter-event.c c99 variable declaration
* clutter/clutter-event.c: * clutter/clutter-event.c:
Remove c99ism. Remove c99ism.
2008-06-23 Emmanuele Bassi <ebassi@openedhand.com> 2008-06-23 Emmanuele Bassi <ebassi@openedhand.com>

12
clutter/clutter-entry.c
View File

@ -277,17 +277,25 @@ clutter_entry_ensure_layout (ClutterEntry *entry, gint width)
{ {
GString *str = g_string_sized_new (priv->n_bytes); GString *str = g_string_sized_new (priv->n_bytes);
gunichar invisible_char; gunichar invisible_char;
gint i; gchar buf[7];
gint char_len, i;
if (priv->priv_char != 0) if (priv->priv_char != 0)
invisible_char = priv->priv_char; invisible_char = priv->priv_char;
else else
invisible_char = '*'; invisible_char = '*';
/* we need to convert the string built of invisible characters
* into UTF-8 for it to be fed to the Pango layout
*/
memset (buf, 0, sizeof (buf));
char_len = g_unichar_to_utf8 (invisible_char, buf);
for (i = 0; i < priv->n_chars; i++) for (i = 0; i < priv->n_chars; i++)
g_string_append_unichar (str, invisible_char); g_string_append_len (str, buf, char_len);
pango_layout_set_text (priv->layout, str->str, str->len); pango_layout_set_text (priv->layout, str->str, str->len);
g_string_free (str, TRUE); g_string_free (str, TRUE);
} }