diff options
| author | Daniel Hirt <hirt.danny@gmail.com> | 2017-08-23 21:58:27 +0300 |
|---|---|---|
| committer | Daniel Hirt <hirt.danny@gmail.com> | 2017-08-23 21:58:27 +0300 |
| commit | 313bae31ac6be2f2ba28728aa590f46e9affdfdd (patch) | |
| tree | be54a9d1c0f303f4d208e32a5309e8614a6690a7 | |
| parent | 3041ca89f422d40c2fef2268d74430f59c44bfec (diff) | |
| download | efl-devs/herdsman/text_async_pars2.tar.gz | |
Canvas text: remove more data_scope_get usagesdevs/herdsman/text_async_pars2
Handling of ellipsis and hyphen in layout.
| -rw-r--r-- | src/lib/evas/canvas/evas_object_textblock.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c index c39fcb60e6..904ed5e51c 100644 --- a/src/lib/evas/canvas/evas_object_textblock.c +++ b/src/lib/evas/canvas/evas_object_textblock.c @@ -5129,7 +5129,7 @@ _layout_ellipsis_item_new(Ctxt *c, const Evas_Object_Textblock_Item *cur_it) if (ellip_ti->parent.format->font.font) { - Evas_Object_Protected_Data *obj = efl_data_scope_get(c->obj, EFL_CANVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *obj = c->evas_o; /* It's only 1 char anyway, we don't need the run end. */ (void) ENFN->font_run_end_get(ENDT, ellip_ti->parent.format->font.font, &script_fi, &cur_fi, @@ -5330,7 +5330,7 @@ _item_get_cutoff(Ctxt *c, Evas_Object_Textblock_Item *it, Evas_Coord x, Evas_Coo { int pos = -1; Evas_Object_Textblock_Text_Item *ti; - Evas_Object_Protected_Data *obj = efl_data_scope_get(c->obj, EFL_CANVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *obj = c->evas_o; ti = (it->type == EVAS_TEXTBLOCK_ITEM_TEXT) ? _ITEM_TEXT(it) : NULL; if (ti && ti->parent.format->font.font) @@ -8106,7 +8106,7 @@ _layout_hyphen_item_new(Ctxt *c, const Evas_Object_Textblock_Text_Item *cur_ti) if (hyphen_ti->parent.format->font.font) { - Evas_Object_Protected_Data *obj = efl_data_scope_get(c->obj, EFL_CANVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *obj = c->evas_o; /* It's only 1 char anyway, we don't need the run end. */ (void) ENFN->font_run_end_get(ENDT, hyphen_ti->parent.format->font.font, &script_fi, &cur_fi, |