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

evas: more fix for ellipsis. 

This one fix size of the object that didn't take into account the style
of the text since we added the support of ellipsis in Evas. It also
correctly detect when we insert an ellipsis in the text to relayout
properly on resize.
This commit is contained in:
Cedric Bail 2013-10-02 20:52:59 +09:00
parent 4c572c827a
commit 44988e4798
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/lib/evas/canvas/evas_object_text.c
View File

@ -689,6 +689,7 @@ _evas_object_text_layout(Evas_Object *eo_obj, Evas_Object_Text *o, Eina_Unicode
Evas_Coord advance = 0; Evas_Coord advance = 0;
size_t pos, visual_pos; size_t pos, visual_pos;
int len = eina_unicode_strlen(text); int len = eina_unicode_strlen(text);
int l = 0, r = 0;
#ifdef BIDI_SUPPORT #ifdef BIDI_SUPPORT
int par_len = len; int par_len = len;
int *segment_idxs = NULL; int *segment_idxs = NULL;
@ -767,12 +768,16 @@ _evas_object_text_layout(Evas_Object *eo_obj, Evas_Object_Text *o, Eina_Unicode
} }
} }
evas_text_style_pad_get(o->cur.style, &l, &r, NULL, NULL);
/* Handle ellipsis */ /* Handle ellipsis */
if (pos && (o->cur.ellipsis >= 0.0) && (advance > obj->cur->geometry.w) && (obj->cur->geometry.w > 0)) if (pos && (o->cur.ellipsis >= 0.0) && (advance + l + r > obj->cur->geometry.w) && (obj->cur->geometry.w > 0))
{ {
Evas_Coord ellip_frame = obj->cur->geometry.w; Evas_Coord ellip_frame = obj->cur->geometry.w;
Evas_Object_Text_Item *start_ellip_it = NULL, *end_ellip_it = NULL; Evas_Object_Text_Item *start_ellip_it = NULL, *end_ellip_it = NULL;
o->last_computed.ellipsis = EINA_TRUE;
/* Account of the ellipsis item width. As long as ellipsis != 0 /* Account of the ellipsis item width. As long as ellipsis != 0
* we have a left ellipsis. And the same with 1 and right. */ * we have a left ellipsis. And the same with 1 and right. */
if (o->cur.ellipsis != 0) if (o->cur.ellipsis != 0)
@ -815,7 +820,7 @@ _evas_object_text_layout(Evas_Object *eo_obj, Evas_Object_Text *o, Eina_Unicode
Evas_Object_Text_Item *itr = o->items; Evas_Object_Text_Item *itr = o->items;
advance = 0; advance = 0;
while (itr && (advance + itr->adv < ellipsis_coord)) while (itr && (advance + l + r + itr->adv < ellipsis_coord))
{ {
Eina_Inlist *itrn = EINA_INLIST_GET(itr)->next; Eina_Inlist *itrn = EINA_INLIST_GET(itr)->next;
if ((itr != start_ellip_it) && (itr != end_ellip_it)) if ((itr != start_ellip_it) && (itr != end_ellip_it))
@ -830,7 +835,7 @@ _evas_object_text_layout(Evas_Object *eo_obj, Evas_Object_Text *o, Eina_Unicode
int cut = 1 + ENFN->font_last_up_to_pos(ENDT, int cut = 1 + ENFN->font_last_up_to_pos(ENDT,
o->font, o->font,
&itr->text_props, &itr->text_props,
ellipsis_coord - advance, ellipsis_coord - (advance + l + r),
0); 0);
if (cut > 0) if (cut > 0)
{ {
@ -841,7 +846,6 @@ _evas_object_text_layout(Evas_Object *eo_obj, Evas_Object_Text *o, Eina_Unicode
{ {
_evas_object_text_item_del(o, itr); _evas_object_text_item_del(o, itr);
} }
o->last_computed.ellipsis = EINA_TRUE;
} }
} }
@ -858,7 +862,7 @@ _evas_object_text_layout(Evas_Object *eo_obj, Evas_Object_Text *o, Eina_Unicode
{ {
if (itr != end_ellip_it) /* was start_ellip_it */ if (itr != end_ellip_it) /* was start_ellip_it */
{ {
if (advance + itr->adv >= ellip_frame) if (advance + l + r + itr->adv >= ellip_frame)
{ {
break; break;
} }
@ -875,7 +879,7 @@ _evas_object_text_layout(Evas_Object *eo_obj, Evas_Object_Text *o, Eina_Unicode
int cut = ENFN->font_last_up_to_pos(ENDT, int cut = ENFN->font_last_up_to_pos(ENDT,
o->font, o->font,
&itr->text_props, &itr->text_props,
ellip_frame - advance, ellip_frame - (advance + l + r),
0); 0);
if (cut >= 0) if (cut >= 0)
{ {
@ -885,7 +889,6 @@ _evas_object_text_layout(Evas_Object *eo_obj, Evas_Object_Text *o, Eina_Unicode
{ {
itr = (Evas_Object_Text_Item *) EINA_INLIST_GET(itr)->next; itr = (Evas_Object_Text_Item *) EINA_INLIST_GET(itr)->next;
} }
o->last_computed.ellipsis = EINA_TRUE;
} }
/* Remove the rest of the items */ /* Remove the rest of the items */
@ -2475,7 +2478,7 @@ _evas_object_text_recalc(Evas_Object *eo_obj, Eina_Unicode *text)
{ {
int min; int min;
min = w + l + r < obj->cur->geometry.w ? w + l + r : obj->cur->geometry.w; min = w + l + r < obj->cur->geometry.w || obj->cur->geometry.w == 0 ? w + l + r : obj->cur->geometry.w;
eo_do_super(eo_obj, MY_CLASS, eo_do_super(eo_obj, MY_CLASS,
evas_obj_size_set(min, h + t + b)); evas_obj_size_set(min, h + t + b));
} }