From 3d50b7307e0d99b846fa87d10bf481d05f2162fe Mon Sep 17 00:00:00 2001 From: SubodhKumar Date: Fri, 4 Nov 2016 15:33:24 +0530 Subject: [PATCH] Edje entry: Do not update anchors outside viewport. Summary: Do not update anchors outside viewport. Problem is that when entry contains large number of anchors, scrolling and launch performance is degraded due to lots of objects being created and maintained, so to enhance the performance of entry with anchors, anchors is not updated outside the viewport. Test Plan: Should have large number of anchors in entry Observe the launch and scrolling performance. Reviewers: tasn, raster, herdsman Subscribers: thiepha, raster, cedric, jpeg Tags: efl Differential Revision: https://phab.enlightenment.org/D3543 Change-Id: I49cf544f3caad9a0e3cf5a9157906a7347eb5af1 Signed-off-by: SubodhKumar --- src/lib/edje/edje_entry.c | 126 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 102 insertions(+), 24 deletions(-) diff --git a/src/lib/edje/edje_entry.c b/src/lib/edje/edje_entry.c index f61fa71..0cee0f3 100644 --- a/src/lib/edje/edje_entry.c +++ b/src/lib/edje/edje_entry.c @@ -1021,7 +1021,6 @@ _item_obj_get(Anchor *an, Evas_Object *o, Evas_Object *smart, Evas_Object *clip) evas_object_stack_above(obj, o); evas_object_clip_set(obj, clip); evas_object_pass_events_set(obj, EINA_TRUE); - evas_object_show(obj); io->an = an; io->name = strdup(an->name); @@ -1056,13 +1055,27 @@ _unused_item_objs_free(Entry *en) } } +static Eina_Bool +_is_anchors_outside_viewport(Evas_Coord oxy, Evas_Coord axy, Evas_Coord awh, + Evas_Coord vxy, Evas_Coord vwh) +{ + if (((oxy + axy + awh) < vxy) || ((oxy + axy) > vwh)) + { + return EINA_TRUE; + } + + return EINA_FALSE; +} + static void _anchors_update(Evas_Textblock_Cursor *c EINA_UNUSED, Evas_Object *o, Entry *en) { Eina_List *l, *ll, *range = NULL; Evas_Coord x, y, w, h; + Evas_Coord vx, vy, vw, vh; + Evas_Coord tvh, tvw; Evas_Object *smart, *clip; - Sel *sel; + Sel *sel = NULL; Anchor *an; Edje *ed = en->ed; @@ -1073,24 +1086,37 @@ _anchors_update(Evas_Textblock_Cursor *c EINA_UNUSED, Evas_Object *o, Entry *en) clip = evas_object_clip_get(o); x = y = w = h = -1; evas_object_geometry_get(o, &x, &y, &w, &h); + evas_output_viewport_get(en->ed->base->evas, &vx, &vy, &vw, &vh); + tvw = vx + vw; + tvh = vy + vh; + EINA_LIST_FOREACH(en->anchors, l, an) { // for item anchors if (an->item) { - Evas_Object *ob; + Evas_Coord cx, cy, cw, ch; - if (!an->sel) + if (!evas_textblock_cursor_format_item_geometry_get + (an->start, &cx, &cy, &cw, &ch)) { - while (an->sel) + continue; + } + + if (_is_anchors_outside_viewport(y, cy, ch, vy, tvh) || + _is_anchors_outside_viewport(x, cx, cw, vx, tvw)) + { + if (an->sel) { sel = an->sel->data; - if (sel->obj_bg) evas_object_del(sel->obj_bg); - if (sel->obj_fg) evas_object_del(sel->obj_fg); - if (sel->obj) evas_object_del(sel->obj); - free(sel); - an->sel = eina_list_remove_list(an->sel, an->sel); + evas_object_hide(sel->obj); } + continue; + } + + if (!an->sel) + { + Evas_Object *ob; sel = calloc(1, sizeof(Sel)); an->sel = eina_list_append(an->sel, sel); @@ -1101,6 +1127,11 @@ _anchors_update(Evas_Textblock_Cursor *c EINA_UNUSED, Evas_Object *o, Entry *en) sel->obj = ob; } } + /* We have only one sel per item */ + sel = an->sel->data; + evas_object_move(sel->obj, x + cx, y + cy); + evas_object_resize(sel->obj, cw, ch); + evas_object_show(sel->obj); } // for link anchors else @@ -1118,6 +1149,32 @@ _anchors_update(Evas_Textblock_Cursor *c EINA_UNUSED, Evas_Object *o, Entry *en) free(sel); an->sel = eina_list_remove_list(an->sel, an->sel); } + Evas_Textblock_Rectangle *r, *r_last; + + r = range->data; + r_last = eina_list_last_data_get(range); + if (r->y != r_last->y) + { + /* For multiple range */ + r->h = r->y + r_last->y + r_last->h; + } + /* For vertically layout entry */ + if (_is_anchors_outside_viewport(y, r->y, r->h, vy, tvh)) + { + EINA_LIST_FREE(range, r) + free(r); + continue; + } + else + { + /* XXX: Should consider for horizontal entry but has + * very minimal usage. Probably we should get the min x + * and max w for range and then decide whether it is in + * the viewport or not. Unnecessary calculation for this + * minimal usage. Please test with large number of anchors + * after implementing it, if its needed to be. + */ + } for (ll = range; ll; ll = eina_list_next(ll)) { Evas_Object *ob; @@ -1167,43 +1224,44 @@ _anchors_update(Evas_Textblock_Cursor *c EINA_UNUSED, Evas_Object *o, Entry *en) evas_object_event_callback_add(ob, EVAS_CALLBACK_MOUSE_MOVE, _edje_anchor_mouse_move_cb, an); evas_object_event_callback_add(ob, EVAS_CALLBACK_MOUSE_IN, _edje_anchor_mouse_in_cb, an); evas_object_event_callback_add(ob, EVAS_CALLBACK_MOUSE_OUT, _edje_anchor_mouse_out_cb, an); - evas_object_show(ob); sel->obj = ob; } } - } - EINA_LIST_FOREACH(an->sel, ll, sel) - { - if (an->item) - { - Evas_Coord cx, cy, cw, ch; - if (!evas_textblock_cursor_format_item_geometry_get - (an->start, &cx, &cy, &cw, &ch)) - continue; - evas_object_move(sel->obj, x + cx, y + cy); - evas_object_resize(sel->obj, cw, ch); - } - else + EINA_LIST_FOREACH(an->sel, ll, sel) { Evas_Textblock_Rectangle *r; r = range->data; *(&(sel->rect)) = *r; + if (_is_anchors_outside_viewport(y, r->y, r->h, vy, tvh) || + _is_anchors_outside_viewport(x, r->x, r->w, vx, tvw)) + { + range = eina_list_remove_list(range, range); + free(r); + evas_object_hide(sel->obj_bg); + evas_object_hide(sel->obj_fg); + evas_object_hide(sel->obj); + continue; + } + if (sel->obj_bg) { evas_object_move(sel->obj_bg, x + r->x, y + r->y); evas_object_resize(sel->obj_bg, r->w, r->h); + evas_object_show(sel->obj_bg); } if (sel->obj_fg) { evas_object_move(sel->obj_fg, x + r->x, y + r->y); evas_object_resize(sel->obj_fg, r->w, r->h); + evas_object_show(sel->obj_fg); } if (sel->obj) { evas_object_move(sel->obj, x + r->x, y + r->y); evas_object_resize(sel->obj, r->w, r->h); + evas_object_show(sel->obj); } range = eina_list_remove_list(range, range); free(r); @@ -2761,6 +2819,23 @@ _edje_part_mouse_move_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_ } static void +_canvas_viewport_resize_cb(void *data, Evas *e EINA_UNUSED, void *event_info EINA_UNUSED) +{ + Edje_Real_Part *rp = data; + Entry *en; + if ((!rp)) return; + + if ((rp->type != EDJE_RP_TYPE_TEXT) || + (!rp->typedata.text)) return; + en = rp->typedata.text->entry_data; + if ((!en) || (rp->part->type != EDJE_PART_TYPE_TEXTBLOCK) || + (rp->part->entry_mode < EDJE_ENTRY_EDIT_MODE_SELECTABLE)) + return; + + _anchors_need_update(rp); +} + +static void _evas_focus_in_cb(void *data, Evas *e, EINA_UNUSED void *event_info) { Edje *ed = (Edje *)data; @@ -2843,6 +2918,7 @@ _edje_entry_real_part_init(Edje *ed, Edje_Real_Part *rp, Ecore_IMF_Context *ic) evas_object_event_callback_add(rp->object, EVAS_CALLBACK_MOUSE_DOWN, _edje_part_mouse_down_cb, rp); evas_object_event_callback_add(rp->object, EVAS_CALLBACK_MOUSE_UP, _edje_part_mouse_up_cb, rp); evas_object_event_callback_add(rp->object, EVAS_CALLBACK_MOUSE_MOVE, _edje_part_mouse_move_cb, rp); + evas_event_callback_add(ed->base->evas, EVAS_CALLBACK_CANVAS_VIEWPORT_RESIZE, _canvas_viewport_resize_cb, rp); if (rp->part->select_mode == EDJE_ENTRY_SELECTION_MODE_DEFAULT) en->select_allow = EINA_TRUE; @@ -3018,6 +3094,8 @@ _edje_entry_real_part_shutdown(Edje *ed, Edje_Real_Part *rp, Eina_Bool reuse_ic) en->pw_timer = NULL; } + evas_event_callback_del(ed->base->evas, EVAS_CALLBACK_CANVAS_VIEWPORT_RESIZE, _canvas_viewport_resize_cb); + #ifdef HAVE_ECORE_IMF if (rp->part->entry_mode >= EDJE_ENTRY_EDIT_MODE_EDITABLE) { -- 2.7.4