enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

Evas textblock: Added evas_textblock_node_format_remove_pair to remove formats. 

SVN revision: 52484
This commit is contained in:
Tom Hacohen 2010-09-20 09:44:48 +00:00
parent 4b73f639d2
commit e8c10dbce7
2 changed files with 66 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
legacy/evas/src/lib/Evas.h
View File

@ -1389,6 +1389,7 @@ typedef void (*Evas_Object_Image_Pixels_Get_Cb) (void *data, Evas_Object *o);
EAPI const Evas_Object_Textblock_Node_Format *evas_textblock_node_format_last_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
EAPI const Evas_Object_Textblock_Node_Format *evas_textblock_node_format_next_get(const Evas_Object_Textblock_Node_Format *n) EINA_ARG_NONNULL(1);
EAPI const Evas_Object_Textblock_Node_Format *evas_textblock_node_format_prev_get(const Evas_Object_Textblock_Node_Format *n) EINA_ARG_NONNULL(1);
EAPI void evas_textblock_node_format_remove_pair(Evas_Object *obj, Evas_Object_Textblock_Node_Format *n) EINA_ARG_NONNULL(1, 2);
EAPI void evas_textblock_cursor_set_at_format(Evas_Textblock_Cursor *cur, const Evas_Object_Textblock_Node_Format *n) EINA_ARG_NONNULL(1, 2);
EAPI const Evas_Object_Textblock_Node_Format *evas_textblock_cursor_format_get(const Evas_Textblock_Cursor *cur) EINA_ARG_NONNULL(1);
EAPI const char *evas_textblock_node_format_text_get(const Evas_Object_Textblock_Node_Format *cur) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1);

65
legacy/evas/src/lib/canvas/evas_object_textblock.c
View File

@ -4293,6 +4293,71 @@ evas_textblock_node_format_prev_get(const Evas_Object_Textblock_Node_Format *n)
return _NODE_FORMAT(EINA_INLIST_GET(n)->prev);
}
/**
* Remove a format node and it's match. i.e, removes a <tag> </tag> pair.
* Assumes the node is the first part of <tag> i.e, this won't work if
* n is a closing tag.
*
* @param obj the evas object of the textblock - not null.
* @param n the current format node - not null.
*/
EAPI void
evas_textblock_node_format_remove_pair(Evas_Object *obj,
Evas_Object_Textblock_Node_Format *n)
{
Evas_Object_Textblock_Node_Text *tnode;
Evas_Object_Textblock_Node_Format *fmt, *pnode;
int level;
TB_HEAD();
if (!n) return;
pnode = NULL;
fmt = n;
tnode = fmt->text_node;
level = 0;
do
{
const char *fstr = eina_strbuf_string_get(fmt->format);
if (fstr && (*fstr == '+'))
{
level++;
}
else if (fstr && (*fstr == '-'))
{
level--;
}
pnode = fmt;
fmt = _NODE_FORMAT(EINA_INLIST_GET(fmt)->next);
}
while (fmt && (level > 0));
if (n->visible)
{
size_t index = _evas_textblock_node_format_pos_get(n);
const char *format = eina_strbuf_string_get(n->format);
Evas_Textblock_Cursor cur;
cur.obj = obj;
eina_ustrbuf_remove(n->text_node->unicode, index, index + 1);
if (format && _IS_PARAGRAPH_SEPARATOR(format))
{
evas_textblock_cursor_set_at_format(&cur, n);
_evas_textblock_cursor_nodes_merge(&cur);
}
_evas_textblock_cursors_update_offset(&cur, n->text_node, index, -1);
}
_evas_textblock_node_format_remove(o, n, 1);
if (pnode && (pnode != n))
{
_evas_textblock_node_format_remove(o, pnode, 0);
}
_evas_textblock_changed(o, obj);
}
/**
* Sets the cursor to the start of the first text node.
*