hippoz/raven
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix text node size handing and add wrapping support

Browse source
This commit is contained in:
hippoz 2023-05-20 18:30:21 +03:00
parent 091bb0a57b
commit 7901afc47c
Signed by: hippoz
GPG key ID: 56C4E02A85F2FBED
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/text-node.c
View file

@ -18,6 +18,7 @@ UITextNode *text_node_new(UINode *parent, PangoFontDescription *desc, UIRGBA col
n->color = color; n->color = color;
n->caret_index = -1; n->caret_index = -1;
n->caret_node = NULL; n->caret_node = NULL;
n->wrap = false;
n->node.text = "text"; n->node.text = "text";
n->node.handle_proto = text_node_handle; n->node.handle_proto = text_node_handle;
node_attach(parent, (UINode*)n); node_attach(parent, (UINode*)n);
@ -43,7 +44,11 @@ int text_node_handle(UINode *node, enum UIEvent ev, size_t d, void *p)
} else { } else {
PangoLayout *layout = pango_cairo_create_layout(n->node.drw); PangoLayout *layout = pango_cairo_create_layout(n->node.drw);
pango_layout_set_font_description(layout, n->desc); pango_layout_set_font_description(layout, n->desc);
if (n->wrap) {
pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR);
} else {
pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_END); pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_END);
}
pango_layout_set_text(layout, n->pending_text, -1); pango_layout_set_text(layout, n->pending_text, -1);
n->layout = layout; n->layout = layout;
n->pending_text = NULL; n->pending_text = NULL;
@ -80,6 +85,12 @@ int text_node_handle(UINode *node, enum UIEvent ev, size_t d, void *p)
if (!n->layout) { if (!n->layout) {
break; break;
} }
if (node->parent->width_policy != UI_SIZE_POLICY_COMPUTED) {
pango_layout_set_width(n->layout, pango_units_from_double(node->parent->rect.w));
}
if (node->parent->height_policy != UI_SIZE_POLICY_COMPUTED) {
pango_layout_set_height(n->layout, pango_units_from_double(node->parent->rect.h));
}
if (n->caret_index >= 0) { if (n->caret_index >= 0) {
if (!n->caret_node) { if (!n->caret_node) {
n->caret_node = node_new(&n->node, "caret"); n->caret_node = node_new(&n->node, "caret");

1
src/text-node.h
View file

@ -15,6 +15,7 @@ typedef struct UITextNode {
UIRGBA color; UIRGBA color;
ssize_t caret_index; ssize_t caret_index;
UINode *caret_node; UINode *caret_node;
bool wrap;
} UITextNode; } UITextNode;
int text_node_handle(UINode *node, enum UIEvent ev, size_t d, void *p); int text_node_handle(UINode *node, enum UIEvent ev, size_t d, void *p);