enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

* edje: Some cleanup, mainly removing dead code. 

SVN revision: 41679
This commit is contained in:
Cedric BAIL 2009-08-11 09:45:06 +00:00
parent 280010f404
commit 922939d832
5 changed files with 37 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
legacy/edje/src/lib/edje_edit.c
View File

@ -179,19 +179,10 @@ _edje_real_part_free(Edje_Real_Part *rp)
if (rp->object)
{
_edje_text_real_part_on_del(rp->edje, rp);
_edje_callbacks_del(rp->object);
evas_object_del(rp->object);
}
l = rp->extra_objects;
while (rp->extra_objects)
{
evas_object_del(eina_list_data_get(rp->extra_objects));
rp->extra_objects = eina_list_remove_list(rp->extra_objects,
rp->extra_objects);
}
if (rp->swallowed_object)
{
evas_object_smart_member_del(rp->swallowed_object);

70
legacy/edje/src/lib/edje_load.c
View File

@ -360,35 +360,44 @@ _edje_object_file_set_internal(Evas_Object *obj, const char *file, const char *g
rp->chosen_description = rp->param1.description;
if (!rp->param1.description)
printf("EDJE ERROR: no default part description!\n");
if (ep->type == EDJE_PART_TYPE_RECTANGLE)
rp->object = evas_object_rectangle_add(ed->evas);
else if (ep->type == EDJE_PART_TYPE_IMAGE)
rp->object = evas_object_image_add(ed->evas);
else if (ep->type == EDJE_PART_TYPE_TEXT)
switch (ep->type)
{
_edje_text_part_on_add(ed, rp);
rp->object = evas_object_text_add(ed->evas);
evas_object_text_font_source_set(rp->object, ed->path);
case EDJE_PART_TYPE_RECTANGLE:
rp->object = evas_object_rectangle_add(ed->evas);
break;
case EDJE_PART_TYPE_IMAGE:
rp->object = evas_object_image_add(ed->evas);
break;
case EDJE_PART_TYPE_TEXT:
_edje_text_part_on_add(ed, rp);
rp->object = evas_object_text_add(ed->evas);
evas_object_text_font_source_set(rp->object, ed->path);
break;
case EDJE_PART_TYPE_SWALLOW:
case EDJE_PART_TYPE_GROUP:
rp->object = evas_object_rectangle_add(ed->evas);
evas_object_color_set(rp->object, 0, 0, 0, 0);
evas_object_pass_events_set(rp->object, 1);
evas_object_pointer_mode_set(rp->object, EVAS_OBJECT_POINTER_MODE_NOGRAB);
break;
case EDJE_PART_TYPE_TEXTBLOCK:
rp->object = evas_object_textblock_add(ed->evas);
break;
case EDJE_PART_TYPE_GRADIENT:
rp->object = evas_object_gradient_add(ed->evas);
break;
case EDJE_PART_TYPE_BOX:
rp->object = evas_object_box_add(ed->evas);
break;
case EDJE_PART_TYPE_TABLE:
rp->object = evas_object_table_add(ed->evas);
break;
default:
printf("EDJE ERROR: wrong part type %i!\n", ep->type);
break;
}
else if (ep->type == EDJE_PART_TYPE_SWALLOW || ep->type == EDJE_PART_TYPE_GROUP)
{
rp->object = evas_object_rectangle_add(ed->evas);
evas_object_color_set(rp->object, 0, 0, 0, 0);
evas_object_pass_events_set(rp->object, 1);
evas_object_pointer_mode_set(rp->object, EVAS_OBJECT_POINTER_MODE_NOGRAB);
}
else if (ep->type == EDJE_PART_TYPE_TEXTBLOCK)
rp->object = evas_object_textblock_add(ed->evas);
else if (ep->type == EDJE_PART_TYPE_GRADIENT)
rp->object = evas_object_gradient_add(ed->evas);
else if (ep->type == EDJE_PART_TYPE_BOX)
{
rp->object = evas_object_box_add(ed->evas);
}
else if (ep->type == EDJE_PART_TYPE_TABLE)
rp->object = evas_object_table_add(ed->evas);
else
printf("EDJE ERROR: wrong part type %i!\n", ep->type);
if (rp->object)
{
evas_object_smart_member_add(rp->object, ed->obj);
@ -443,7 +452,6 @@ _edje_object_file_set_internal(Evas_Object *obj, const char *file, const char *g
rp->param1.rel2_to_x = ed->table_parts[rp->param1.description->rel2.id_x % ed->table_parts_size];
if (rp->param1.description->rel2.id_y >= 0)
rp->param1.rel2_to_y = ed->table_parts[rp->param1.description->rel2.id_y % ed->table_parts_size];
_edje_text_part_on_add_clippers(ed, rp);
if (rp->part->clip_to_id >= 0)
{
rp->clip_to = ed->table_parts[rp->part->clip_to_id % ed->table_parts_size];
@ -785,7 +793,6 @@ _edje_file_del(Edje *ed)
_edje_entry_real_part_shutdown(rp);
if (rp->object)
{
_edje_text_real_part_on_del(ed, rp);
_edje_callbacks_del(rp->object);
evas_object_del(rp->object);
}
@ -836,10 +843,7 @@ _edje_file_del(Edje *ed)
_edje_textblock_styles_del(ed);
EINA_LIST_FOREACH(ed->collection->parts, l, ep)
{
_edje_text_part_on_del(ed, ep);
_edje_color_class_on_del(ed, ep);
}
_edje_color_class_on_del(ed, ep);
_edje_cache_coll_unref(ed->file, ed->collection);
ed->collection = NULL;
}

3
legacy/edje/src/lib/edje_private.h
View File

@ -762,7 +762,6 @@ struct _Edje_Real_Part
Edje *edje; // 4
Edje_Part *part; // 4
Evas_Object *object; // 4
Eina_List *extra_objects; // 4
Evas_Object *swallowed_object; // 4 // FIXME: move with swallow_params data
Eina_List *items; // 4 //FIXME: only if table/box
void *entry_data; // 4 // FIXME: move to entry section
@ -1131,9 +1130,7 @@ void _edje_callbacks_patterns_clean(Edje *ed);
void _edje_text_init(void);
void _edje_text_part_on_add(Edje *ed, Edje_Real_Part *ep);
void _edje_text_part_on_add_clippers(Edje *ed, Edje_Real_Part *ep);
void _edje_text_part_on_del(Edje *ed, Edje_Part *ep);
void _edje_text_real_part_on_del(Edje *ed, Edje_Real_Part *ep);
void _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep, Edje_Calc_Params *params, Edje_Part_Description *chosen_desc);
Evas_Font_Size _edje_text_size_calc(Evas_Font_Size size, Edje_Text_Class *tc);
const char * _edje_text_class_font_get(Edje *ed, Edje_Part_Description *chosen_desc, int *size, char **free_later);

13
legacy/edje/src/lib/edje_smart.c
View File

@ -137,19 +137,6 @@ _edje_smart_move(Evas_Object * obj, Evas_Coord x, Evas_Coord y)
evas_object_geometry_get(ep->swallowed_object, &ox, &oy, NULL, NULL);
evas_object_move(ep->swallowed_object, ed->x + ep->x + ep->offset.x, ed->y + ep->y +ep->offset.y);
}
if (ep->extra_objects)
{
Eina_List *el;
Evas_Object *o;
EINA_LIST_FOREACH(ep->extra_objects, el, o)
{
Evas_Coord oox, ooy;
evas_object_geometry_get(o, &oox, &ooy, NULL, NULL);
evas_object_move(o, ed->x + ep->x + ep->offset.x + (oox - ox), ed->y + ep->y + ep->offset.y + (ooy - oy));
}
}
}
// _edje_emit(ed, "move", NULL);
}

33
legacy/edje/src/lib/edje_text.c
View File

@ -56,26 +56,6 @@ _edje_text_part_on_add(Edje *ed, Edje_Real_Part *ep)
_edje_text_class_member_add(ed, desc->text.text_class);
}
void
_edje_text_part_on_add_clippers(Edje *ed, Edje_Real_Part *ep)
{
Eina_List *l;
Evas_Object *o;
EINA_LIST_FOREACH(ep->extra_objects, l, o)
{
if (ep->part->clip_to_id >= 0)
{
ep->clip_to = ed->table_parts[ep->part->clip_to_id % ed->table_parts_size];
if (ep->clip_to)
{
evas_object_pass_events_set(ep->clip_to->object, 1);
evas_object_clip_set(o, ep->clip_to->object);
}
}
}
}
void
_edje_text_part_on_del(Edje *ed, Edje_Part *pt)
{
@ -90,19 +70,6 @@ _edje_text_part_on_del(Edje *ed, Edje_Part *pt)
_edje_text_class_member_del(ed, desc->text.text_class);
}
void
_edje_text_real_part_on_del(Edje *ed, Edje_Real_Part *ep)
{
while (ep->extra_objects)
{
Evas_Object *o;
o = eina_list_data_get(ep->extra_objects);
ep->extra_objects = eina_list_remove(ep->extra_objects, o);
evas_object_del(o);
}
}
static void
_edje_text_fit_set(char *buf, const char *text, int c1, int c2)
{