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

* edje: attempt to reduce code size by using more macro. 

SVN revision: 50281
This commit is contained in:
Cedric BAIL 2010-07-16 13:58:35 +00:00
parent 8e1a7c28e6
commit 83bb52f7c9
6 changed files with 317 additions and 1016 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
legacy/edje/src/bin/edje_cc_handlers.c
View File

@ -1965,7 +1965,7 @@ ob_collections_group_parts_part(void)
ep->use_alternate_font_metrics = 0;
ep->clip_to_id = -1;
ep->dragable.confine_id = -1;
ep->dragable.events_id = -1;
ep->dragable.event_id = -1;
ep->items = NULL;
}
@ -2714,7 +2714,7 @@ st_collections_group_parts_part_dragable_events(void)
char *name;
name = parse_str(0);
data_queue_part_lookup(pc, name, &(ep->dragable.events_id));
data_queue_part_lookup(pc, name, &(ep->dragable.event_id));
free(name);
}
}

8
legacy/edje/src/lib/edje_cache.c
View File

@ -323,23 +323,23 @@ _edje_cache_file_coll_open(const char *file, const char *coll, int *error_ret, E
hist = NULL;
hist = eina_list_append(hist, ep);
ep2 = ep;
while (ep2->dragable.events_id >= 0)
while (ep2->dragable.event_id >= 0)
{
Edje_Part* prev;
prev = ep2;
ep2 = eina_list_nth(edc->parts, ep2->dragable.events_id);
ep2 = eina_list_nth(edc->parts, ep2->dragable.event_id);
if (!ep2->dragable.x && !ep2->dragable.y)
{
prev->dragable.events_id = -1;
prev->dragable.event_id = -1;
break;
}
if (eina_list_data_find(hist, ep2))
{
ERR("events_to loops. invalidating loop.");
ep2->dragable.events_id = -1;
ep2->dragable.event_id = -1;
break;
}
hist = eina_list_append(hist, ep2);

2
legacy/edje/src/lib/edje_data.c
View File

@ -408,7 +408,7 @@ _edje_edd_init(void)
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part, Edje_Part, "dragable.step_y", dragable.step_y, EET_T_INT);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part, Edje_Part, "dragable.count_y", dragable.count_y, EET_T_INT);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part, Edje_Part, "dragable.counfine_id", dragable.confine_id, EET_T_INT);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part, Edje_Part, "dragable.events_id", dragable.events_id, EET_T_INT);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part, Edje_Part, "dragable.events_id", dragable.event_id, EET_T_INT);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part, Edje_Part, "entry_mode", entry_mode, EET_T_UCHAR);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part, Edje_Part, "select_mode", select_mode, EET_T_UCHAR);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part, Edje_Part, "multiline", multiline, EET_T_UCHAR);

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

File diff suppressed because it is too large Load Diff

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

@ -515,10 +515,10 @@ _edje_object_file_set_internal(Evas_Object *obj, const char *file, const char *g
}
/* replay events for dragable */
if (rp->part->dragable.events_id >= 0)
if (rp->part->dragable.event_id >= 0)
{
rp->events_to =
ed->table_parts[rp->part->dragable.events_id % ed->table_parts_size];
ed->table_parts[rp->part->dragable.event_id % ed->table_parts_size];
/* events_to may be used only with dragable */
if (!rp->events_to->part->dragable.x &&
!rp->events_to->part->dragable.y)

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

@ -597,7 +597,7 @@ struct _Edje_Part
int confine_id; /* dragging within this bit, -1 = no */
/* davinchi */
int events_id; /* If it is used as scrollbar */
int event_id; /* If it is used as scrollbar */
signed char x; /* can u click & drag this bit in x dir */
signed char y; /* can u click & drag this bit in y dir */