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

Evas textblock: Fixed cursor sizes in rare situations, for example the text from expedite textblock_basic test and point the 'c' in COLOR you would get a badly shaped cursor. 

SVN revision: 51050
This commit is contained in:
Tom Hacohen 2010-08-12 15:49:43 +00:00
parent 1b77b770fc
commit 2ecda40ecd
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3132,10 +3132,9 @@ _find_layout_item_line_match(Evas_Object *obj, Evas_Object_Textblock_Node_Text *
itn = (Evas_Object_Textblock_Item *)(((Eina_Inlist *)it)->next); itn = (Evas_Object_Textblock_Item *)(((Eina_Inlist *)it)->next);
p = (int)(it->source_pos + eina_unicode_strlen(it->text)); p = (int)(it->source_pos + eina_unicode_strlen(it->text));
/*FIXME: Bad, this sholud be > pos */ if ((p > pos) ||
if ((p >= pos) ||
((p == pos) && (!lnn) && ((p == pos) && (!lnn) &&
((!itn) | ((!itn) ||
((itn) && (itn->source_node != n))))) ((itn) && (itn->source_node != n)))))
{ {
*lnr = ln; *lnr = ln;
@ -4786,8 +4785,7 @@ evas_textblock_cursor_line_char_last(Evas_Textblock_Cursor *cur)
cur->node = it->source_node; cur->node = it->source_node;
index = eina_unicode_strlen(it->text) - 1; index = eina_unicode_strlen(it->text) - 1;
if (index < 0) index = 0; if (index < 0) index = 0;
if ((index >= 0) && (it->text[0] != 0)) if (index >= 0) GET_NEXT(it->text, index);
GET_NEXT(it->text, index);
if (index >= 0) cur->pos += index; if (index >= 0) cur->pos += index;
} }
else if (fi) else if (fi)