bu5hm4n
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

elementary: fix refactoring and assert. 

SVN revision: 58828
This commit is contained in:
Cedric BAIL 2011-04-22 13:20:06 +00:00
parent d49218d308
commit b86180520d
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
legacy/elementary/src/lib/elm_genlist.c
View File

@ -1,3 +1,5 @@
#include <assert.h>
#include <Elementary.h> #include <Elementary.h>
#include <Elementary_Cursor.h> #include <Elementary_Cursor.h>
#include <assert.h> #include <assert.h>
@ -1710,16 +1712,15 @@ _item_cache_free(Item_Cache *itc)
static void static void
_item_label_realize(Elm_Genlist_Item *it, _item_label_realize(Elm_Genlist_Item *it,
Evas_Object *target, Evas_Object *target,
const Eina_List *source) Eina_List **source)
{ {
if (it->itc->func.label_get) if (it->itc->func.label_get)
{ {
const Eina_List *l; const Eina_List *l;
const char *key; const char *key;
it->mode_labels = *source = elm_widget_stringlist_get(edje_object_data_get(target, "labels"));
elm_widget_stringlist_get(edje_object_data_get(target, "labels")); EINA_LIST_FOREACH(*source, l, key)
EINA_LIST_FOREACH(source, l, key)
{ {
char *s = it->itc->func.label_get char *s = it->itc->func.label_get
((void *)it->base.data, it->base.widget, key); ((void *)it->base.data, it->base.widget, key);
@ -1740,7 +1741,7 @@ _item_label_realize(Elm_Genlist_Item *it,
static Eina_List * static Eina_List *
_item_icon_realize(Elm_Genlist_Item *it, _item_icon_realize(Elm_Genlist_Item *it,
Evas_Object *target, Evas_Object *target,
Eina_List *source) Eina_List **source)
{ {
Eina_List *res = NULL; Eina_List *res = NULL;
@ -1749,10 +1750,8 @@ _item_icon_realize(Elm_Genlist_Item *it,
const Eina_List *l; const Eina_List *l;
const char *key; const char *key;
it->mode_icons = *source = elm_widget_stringlist_get(edje_object_data_get(target, "icons"));
elm_widget_stringlist_get(edje_object_data_get(target, EINA_LIST_FOREACH(*source, l, key)
"icons"));
EINA_LIST_FOREACH(source, l, key)
{ {
Evas_Object *ic = it->itc->func.icon_get Evas_Object *ic = it->itc->func.icon_get
((void *)it->base.data, it->base.widget, key); ((void *)it->base.data, it->base.widget, key);
@ -1760,7 +1759,7 @@ _item_icon_realize(Elm_Genlist_Item *it,
if (ic) if (ic)
{ {
res = eina_list_append(res, ic); res = eina_list_append(res, ic);
edje_object_part_swallow(it->mode_view, key, ic); edje_object_part_swallow(target, key, ic);
evas_object_show(ic); evas_object_show(ic);
elm_widget_sub_object_add(it->base.widget, ic); elm_widget_sub_object_add(it->base.widget, ic);
} }
@ -1773,7 +1772,7 @@ _item_icon_realize(Elm_Genlist_Item *it,
static void static void
_item_state_realize(Elm_Genlist_Item *it, _item_state_realize(Elm_Genlist_Item *it,
Evas_Object *target, Evas_Object *target,
Eina_List *source) Eina_List **source)
{ {
if (it->itc->func.state_get) if (it->itc->func.state_get)
{ {
@ -1781,9 +1780,8 @@ _item_state_realize(Elm_Genlist_Item *it,
const char *key; const char *key;
char buf[4096]; char buf[4096];
it->mode_states = *source = elm_widget_stringlist_get(edje_object_data_get(target, "states"));
elm_widget_stringlist_get(edje_object_data_get(target, "states")); EINA_LIST_FOREACH(*source, l, key)
EINA_LIST_FOREACH(source, l, key)
{ {
Eina_Bool on = it->itc->func.state_get Eina_Bool on = it->itc->func.state_get
((void *)it->base.data, it->base.widget, key); ((void *)it->base.data, it->base.widget, key);
@ -1936,11 +1934,11 @@ _item_realize(Elm_Genlist_Item *it,
{ {
/* FIXME: If you see that assert, please notify us and we /* FIXME: If you see that assert, please notify us and we
will clean our mess */ will clean our mess */
assert(eina_list_count(it->icon_objs) != 0); assert(eina_list_count(it->icon_objs) == 0);
_item_label_realize(it, it->base.view, it->labels); _item_label_realize(it, it->base.view, &it->labels);
it->icon_objs = _item_icon_realize(it, it->base.view, it->icons); it->icon_objs = _item_icon_realize(it, it->base.view, &it->icons);
_item_state_realize(it, it->base.view, it->states); _item_state_realize(it, it->base.view, &it->states);
if (!it->mincalcd) if (!it->mincalcd)
{ {
@ -2744,11 +2742,13 @@ _mode_item_realize(Elm_Genlist_Item *it)
/* label_get, icon_get, state_get */ /* label_get, icon_get, state_get */
/* FIXME: If you see that assert, please notify us and we /* FIXME: If you see that assert, please notify us and we
will clean our mess */ will clean our mess */
assert(eina_list_count(it->mode_icon_objs) != 0); assert(eina_list_count(it->mode_icon_objs) == 0);
_item_label_realize(it, it->mode_view, it->mode_labels); _item_label_realize(it, it->mode_view, &it->mode_labels);
it->mode_icon_objs = _item_icon_realize(it, it->mode_view, it->mode_icons); it->mode_icon_objs = _item_icon_realize(it,
_item_state_realize(it, it->mode_view, it->mode_states); it->mode_view,
&it->mode_icons);
_item_state_realize(it, it->mode_view, &it->mode_states);
edje_object_part_swallow(it->mode_view, edje_object_part_swallow(it->mode_view,
edje_object_data_get(it->mode_view, "mode_part"), edje_object_data_get(it->mode_view, "mode_part"),