borisfaure
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Canvas text: fix annotation set 

The cursor position was not set correctly to the respective fnode, causing
annotation to not be applied correctly with text that has more than one
paragraph.
This commit is contained in:
Daniel Hirt 2016-07-11 11:09:48 +00:00
parent 113f828b3c
commit 0c38846e33
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/lib/evas/canvas/evas_object_textblock.c
View File

@ -12176,7 +12176,7 @@ _evas_textblock_cursor_format_item_geometry_get(const Efl_Canvas_Text_Cursor_Dat
Evas_Object_Textblock_Item *it = NULL;
Evas_Coord x, y, w, h;
if (!cur || !_evas_textblock_cursor_format_is_visible_get(cur)) return EINA_FALSE;
if (!cur) return EINA_FALSE;
Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
evas_object_async_block(obj);
Efl_Canvas_Text_Data *o = eo_data_scope_get(cur->obj, MY_CLASS);
@ -13705,9 +13705,8 @@ _textblock_cursor_pos_at_fnode_set(Eo *eo_obj EINA_UNUSED,
Efl_Canvas_Text_Cursor_Data *cur,
Evas_Object_Textblock_Node_Format *fnode)
{
/* Get the relative offset to cur's text node */
size_t off = _evas_textblock_node_format_pos_get(fnode);
_evas_textblock_cursor_pos_set(cur, off);
cur->node = fnode->text_node;
cur->pos = _evas_textblock_node_format_pos_get(fnode);
}
static Eina_Bool