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

Evas textblock: We finally cache fi - remove related hacks. 

SVN revision: 59129
This commit is contained in:
Tom Hacohen 2011-05-02 15:33:27 +00:00
parent fdc092efe1
commit 0bf964a221
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2842,7 +2842,6 @@ skip:
c->par->bidi_props, ti->parent.text_pos, tmp_len);
}
}
ti->text_props.repch = urepch;
str += tmp_len;
cur_len -= tmp_len;
@ -8063,8 +8062,7 @@ evas_object_textblock_render(Evas_Object *obj, void *output, void *context, void
obj->cur.geometry.x + ln->par->x + ln->x + ti->parent.x + x + (ox), \
obj->cur.geometry.y + ln->par->y + ln->y + yoff + y + (oy), \
ti->parent.w, ti->parent.h, ti->parent.w, ti->parent.h, \
/* FIXME: inline if - awful hack until we don't need text in draw */ \
(ti != ln->ellip_ti) ? GET_ITEM_TEXT(ti) : _ellip_str, \
GET_ITEM_TEXT(ti), \
&ti->text_props);
#define ITEM_WALK_LINE_SKIP_DROP() \
if ((ln->par->y + ln->y + ln->h) <= 0) continue; \

4
legacy/evas/src/lib/engines/common/evas_text_utils.h
View File

@ -24,10 +24,6 @@ struct _Evas_Text_Props
Evas_Script_Type script;
Evas_Text_Props_Info *info;
void *font_instance;
/* FIXME: just a hack in the meanwhile, remove when I can finally cache
* fi and split to scripts without harfbuzz */
Eina_Unicode repch;
};
struct _Evas_Text_Props_Info