nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

assume a valid utf8 char is at the shortcut position. the menu parser makes sure of this

Browse source
This commit is contained in:
Dana Jansens 2007-04-26 03:18:48 +00:00
parent baa9ad1480
commit c4ba6e605a
1 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
render/font.c
View file

@ -252,19 +252,17 @@ void RrFontDraw(XftDraw *d, RrTextureText *t, RrRect *area)
if (t->shortcut) { if (t->shortcut) {
const gchar *c = t->string + t->shortcut_pos; const gchar *c = t->string + t->shortcut_pos;
if (g_utf8_validate(c, -1, NULL)) { t->font->shortcut_underline->start_index = t->shortcut_pos;
t->font->shortcut_underline->start_index = t->shortcut_pos; t->font->shortcut_underline->end_index = t->shortcut_pos +
t->font->shortcut_underline->end_index = t->shortcut_pos + (g_utf8_next_char(c) - c);
(g_utf8_next_char(c) - c);
/* the attributes are owned by the layout. /* the attributes are owned by the layout.
re-add the attributes to the layout after changing the re-add the attributes to the layout after changing the
start and end index */ start and end index */
attrlist = pango_layout_get_attributes(t->font->layout); attrlist = pango_layout_get_attributes(t->font->layout);
pango_attr_list_ref(attrlist); pango_attr_list_ref(attrlist);
pango_layout_set_attributes(t->font->layout, attrlist); pango_layout_set_attributes(t->font->layout, attrlist);
pango_attr_list_unref(attrlist); pango_attr_list_unref(attrlist);
}
} }
/* layout_line() uses y to specify the baseline /* layout_line() uses y to specify the baseline