interesting
/
libui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

And switched attributes on on GTK+. We have a problem with attributes that span bytes.

This commit is contained in:
Pietro Gagliardi 2017-02-20 19:28:19 -05:00
parent d7a44a5168
commit d4b38cd3b7
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
unix/attrstr.c
View File

@ -229,7 +229,7 @@ static gboolean applyFeatures(gpointer key, gpointer value, gpointer data)
// remove the trailing comma/space // remove the trailing comma/space
g_string_truncate(s, s->len - 2); g_string_truncate(s, s->len - 2);
addattr(p, *pos, 1, addattr(p, *pos, *pos + 1,
FUTURE_pango_attr_font_features_new(s->str)); FUTURE_pango_attr_font_features_new(s->str));
return TRUE; // always delete; we're emptying the map return TRUE; // always delete; we're emptying the map
} }

5
unix/drawtext.c
View File

@ -101,6 +101,7 @@ uiDrawTextLayout *uiDrawNewTextLayout(uiDrawTextLayoutParams *p)
uiDrawTextLayout *tl; uiDrawTextLayout *tl;
PangoContext *context; PangoContext *context;
PangoFontDescription *desc; PangoFontDescription *desc;
PangoAttrList *attrs;
int pangoWidth; int pangoWidth;
tl = uiNew(uiDrawTextLayout); tl = uiNew(uiDrawTextLayout);
@ -137,7 +138,9 @@ uiDrawTextLayout *uiDrawNewTextLayout(uiDrawTextLayoutParams *p)
pango_layout_set_alignment(tl->layout, pangoAligns[p->Align]); pango_layout_set_alignment(tl->layout, pangoAligns[p->Align]);
// TODO attributes attrs = attrstrToPangoAttrList(p);
pango_layout_set_attributes(tl->layout, attrs);
pango_attr_list_unref(attrs);
tl->nLines = pango_layout_get_line_count(tl->layout); tl->nLines = pango_layout_get_line_count(tl->layout);
computeLineMetrics(tl); computeLineMetrics(tl);