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

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@59129 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/canvas/evas_object_textblock.c b/src/lib/canvas/evas_object_textblock.c
index 1791fc6..7520916 100644 (file)
--- a/src/lib/canvas/evas_object_textblock.c
+++ b/src/lib/canvas/evas_object_textblock.c
@@ -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; \

diff --git a/src/lib/engines/common/evas_text_utils.h b/src/lib/engines/common/evas_text_utils.h
index d69cfd0..1285d5f 100644 (file)
--- a/src/lib/engines/common/evas_text_utils.h
+++ b/src/lib/engines/common/evas_text_utils.h
@@ -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