greatly improve performance by caching text size
This commit is contained in:
parent
996d6fb520
commit
8e28a79e88
2 changed files with 21 additions and 15 deletions
|
@ -17,6 +17,9 @@ UITextNode *text_node_new(UINode *parent, PangoFontDescription *desc, UIRGBA col
|
|||
n->color = color;
|
||||
n->caret_index = -1;
|
||||
n->caret_node = NULL;
|
||||
n->computed_dimensions_invalid = true;
|
||||
n->computed_text_width = 0;
|
||||
n->computed_text_height = 0;
|
||||
n->node.text = "text";
|
||||
n->node.handle_proto = text_node_handle;
|
||||
node_attach(parent, (UINode*)n);
|
||||
|
@ -47,6 +50,7 @@ int text_node_handle(UINode *node, enum UIEvent ev, size_t d, void *p)
|
|||
n->layout = layout;
|
||||
n->pending_text = NULL;
|
||||
}
|
||||
n->computed_dimensions_invalid = true;
|
||||
}
|
||||
|
||||
switch (ev) {
|
||||
|
@ -59,23 +63,22 @@ int text_node_handle(UINode *node, enum UIEvent ev, size_t d, void *p)
|
|||
cairo_fill(n->node.drw);
|
||||
break;
|
||||
}
|
||||
case UI_EVENT_GET_WIDTH: {
|
||||
if (!n->layout) {
|
||||
break;
|
||||
}
|
||||
int w;
|
||||
pango_layout_get_size(n->layout, &w, NULL);
|
||||
*(double*)p = pango_units_to_double(w);
|
||||
return 1;
|
||||
}
|
||||
case UI_EVENT_GET_WIDTH: /* through */
|
||||
case UI_EVENT_GET_HEIGHT: {
|
||||
if (!n->layout) {
|
||||
break;
|
||||
if (n->computed_dimensions_invalid) {
|
||||
int w, h = 0;
|
||||
pango_layout_get_size(n->layout, &w, &h);
|
||||
n->computed_text_width = pango_units_to_double(w);
|
||||
n->computed_text_height = pango_units_to_double(h);
|
||||
n->computed_dimensions_invalid = false;
|
||||
}
|
||||
int h;
|
||||
pango_layout_get_size(n->layout, NULL, &h);
|
||||
*(double*)p = pango_units_to_double(h);
|
||||
return 1;
|
||||
if (ev == UI_EVENT_GET_WIDTH) {
|
||||
*(double*)p = n->computed_text_width;
|
||||
}
|
||||
if (ev == UI_EVENT_GET_HEIGHT) {
|
||||
*(double*)p = n->computed_text_height;
|
||||
}
|
||||
break;
|
||||
}
|
||||
case UI_EVENT_RELAYOUT: {
|
||||
if (!n->layout) {
|
||||
|
|
|
@ -15,6 +15,9 @@ typedef struct UITextNode {
|
|||
UIRGBA color;
|
||||
ssize_t caret_index;
|
||||
UINode *caret_node;
|
||||
double computed_text_width;
|
||||
double computed_text_height;
|
||||
bool computed_dimensions_invalid;
|
||||
} UITextNode;
|
||||
|
||||
int text_node_handle(UINode *node, enum UIEvent ev, size_t d, void *p);
|
||||
|
|
Loading…
Reference in a new issue