cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=9cc8c470be4aee9c7f6a48f624c233194c91c368
commit 9cc8c470be4aee9c7f6a48f624c233194c91c368
Author: Subodh Kumar <s7158.ku...@samsung.com>
Date: Tue Oct 20 11:57:17 2015 -0700
edje entry: do not create object if theme source is not available.
Summary:
Object not created if theme source is not available.
In many case we dont need or define all the
theme sources for entry, even if the sources are
null, edje object is being created.
Test Plan: NA
Reviewers: tasn, herdsman, cedric
Reviewed By: cedric
Subscribers: cedric
Differential Revision: https://phab.enlightenment.org/D3199
Signed-off-by: Cedric BAIL <ced...@osg.samsung.com>
---
src/lib/edje/edje_entry.c | 122 ++++++++++++++++++++++++++--------------------
1 file changed, 69 insertions(+), 53 deletions(-)
diff --git a/src/lib/edje/edje_entry.c b/src/lib/edje/edje_entry.c
index b6cbf84..bf9a140 100644
--- a/src/lib/edje/edje_entry.c
+++ b/src/lib/edje/edje_entry.c
@@ -674,25 +674,31 @@ _sel_update(Edje *ed, Evas_Textblock_Cursor *c
EINA_UNUSED, Evas_Object *o, Entr
sel = calloc(1, sizeof(Sel));
en->sel = eina_list_append(en->sel, sel);
- ob = edje_object_add(ed->base->evas);
- edje_object_file_set(ob, ed->path, en->rp->part->source);
- evas_object_smart_member_add(ob, smart);
- evas_object_stack_below(ob, o);
- evas_object_clip_set(ob, clip);
- evas_object_pass_events_set(ob, EINA_TRUE);
- evas_object_show(ob);
- sel->obj_bg = ob;
- _edje_subobj_register(ed, sel->obj_bg);
-
- ob = edje_object_add(ed->base->evas);
- edje_object_file_set(ob, ed->path, en->rp->part->source2);
- evas_object_smart_member_add(ob, smart);
- evas_object_stack_above(ob, o);
- evas_object_clip_set(ob, clip);
- evas_object_pass_events_set(ob, EINA_TRUE);
- evas_object_show(ob);
- sel->obj_fg = ob;
- _edje_subobj_register(ed, sel->obj_fg);
+ if (en->rp->part->source)
+ {
+ ob = edje_object_add(ed->base->evas);
+ edje_object_file_set(ob, ed->path,
en->rp->part->source);
+ evas_object_smart_member_add(ob, smart);
+ evas_object_stack_below(ob, o);
+ evas_object_clip_set(ob, clip);
+ evas_object_pass_events_set(ob, EINA_TRUE);
+ evas_object_show(ob);
+ sel->obj_bg = ob;
+ _edje_subobj_register(ed, sel->obj_bg);
+ }
+
+ if (en->rp->part->source2)
+ {
+ ob = edje_object_add(ed->base->evas);
+ edje_object_file_set(ob, ed->path,
en->rp->part->source2);
+ evas_object_smart_member_add(ob, smart);
+ evas_object_stack_above(ob, o);
+ evas_object_clip_set(ob, clip);
+ evas_object_pass_events_set(ob, EINA_TRUE);
+ evas_object_show(ob);
+ sel->obj_fg = ob;
+ _edje_subobj_register(ed, sel->obj_fg);
+ }
}
else
{
@@ -970,25 +976,31 @@ _anchors_update(Evas_Textblock_Cursor *c EINA_UNUSED,
Evas_Object *o, Entry *en)
sel = calloc(1, sizeof(Sel));
an->sel = eina_list_append(an->sel, sel);
- ob = edje_object_add(ed->base->evas);
- edje_object_file_set(ob, ed->path,
en->rp->part->source5);
- evas_object_smart_member_add(ob, smart);
- evas_object_stack_below(ob, o);
- evas_object_clip_set(ob, clip);
- evas_object_pass_events_set(ob, EINA_TRUE);
- evas_object_show(ob);
- sel->obj_bg = ob;
- _edje_subobj_register(ed, sel->obj_bg);
+ if (en->rp->part->source5)
+ {
+ ob = edje_object_add(ed->base->evas);
+ edje_object_file_set(ob, ed->path,
en->rp->part->source5);
+ evas_object_smart_member_add(ob, smart);
+ evas_object_stack_below(ob, o);
+ evas_object_clip_set(ob, clip);
+ evas_object_pass_events_set(ob, EINA_TRUE);
+ evas_object_show(ob);
+ sel->obj_bg = ob;
+ _edje_subobj_register(ed, sel->obj_bg);
+ }
- ob = edje_object_add(ed->base->evas);
- edje_object_file_set(ob, ed->path,
en->rp->part->source6);
- evas_object_smart_member_add(ob, smart);
- evas_object_stack_above(ob, o);
- evas_object_clip_set(ob, clip);
- evas_object_pass_events_set(ob, EINA_TRUE);
- evas_object_show(ob);
- sel->obj_fg = ob;
- _edje_subobj_register(ed, sel->obj_fg);
+ if (en->rp->part->source6)
+ {
+ ob = edje_object_add(ed->base->evas);
+ edje_object_file_set(ob, ed->path,
en->rp->part->source6);
+ evas_object_smart_member_add(ob, smart);
+ evas_object_stack_above(ob, o);
+ evas_object_clip_set(ob, clip);
+ evas_object_pass_events_set(ob, EINA_TRUE);
+ evas_object_show(ob);
+ sel->obj_fg = ob;
+ _edje_subobj_register(ed, sel->obj_fg);
+ }
ob = evas_object_rectangle_add(ed->base->evas);
evas_object_color_set(ob, 0, 0, 0, 0);
@@ -2585,22 +2597,26 @@ _edje_entry_real_part_init(Edje *ed, Edje_Real_Part *rp)
evas_object_textblock_replace_char_set(rp->object, "*");
}
- en->cursor_bg = edje_object_add(ed->base->evas);
- edje_object_file_set(en->cursor_bg, ed->path, rp->part->source3);
- evas_object_smart_member_add(en->cursor_bg, ed->obj);
- evas_object_stack_below(en->cursor_bg, rp->object);
- evas_object_clip_set(en->cursor_bg, evas_object_clip_get(rp->object));
- evas_object_pass_events_set(en->cursor_bg, EINA_TRUE);
- _edje_subobj_register(ed, en->cursor_bg);
-
- en->cursor_fg = edje_object_add(ed->base->evas);
- edje_object_file_set(en->cursor_fg, ed->path, rp->part->source4);
- evas_object_smart_member_add(en->cursor_fg, ed->obj);
- evas_object_stack_above(en->cursor_fg, rp->object);
- evas_object_clip_set(en->cursor_fg, evas_object_clip_get(rp->object));
- evas_object_pass_events_set(en->cursor_fg, EINA_TRUE);
- _edje_subobj_register(ed, en->cursor_fg);
-
+ if (rp->part->source3)
+ {
+ en->cursor_bg = edje_object_add(ed->base->evas);
+ edje_object_file_set(en->cursor_bg, ed->path, rp->part->source3);
+ evas_object_smart_member_add(en->cursor_bg, ed->obj);
+ evas_object_stack_below(en->cursor_bg, rp->object);
+ evas_object_clip_set(en->cursor_bg, evas_object_clip_get(rp->object));
+ evas_object_pass_events_set(en->cursor_bg, EINA_TRUE);
+ _edje_subobj_register(ed, en->cursor_bg);
+ }
+ if (rp->part->source4)
+ {
+ en->cursor_fg = edje_object_add(ed->base->evas);
+ edje_object_file_set(en->cursor_fg, ed->path, rp->part->source4);
+ evas_object_smart_member_add(en->cursor_fg, ed->obj);
+ evas_object_stack_above(en->cursor_fg, rp->object);
+ evas_object_clip_set(en->cursor_fg, evas_object_clip_get(rp->object));
+ evas_object_pass_events_set(en->cursor_fg, EINA_TRUE);
+ _edje_subobj_register(ed, en->cursor_fg);
+ }
/* A proxy to the main cursor. */
if (rp->part->cursor_mode == EDJE_ENTRY_CURSOR_MODE_BEFORE)
{
--
