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

diskselector, flipselector: Optimize eo item usage. 

Remove unnecessary pointer reference.
This commit is contained in:
Daniel Juyung Seo 2014-11-25 21:54:52 +09:00
parent fb4b67afb5
commit 288189ede6
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
legacy/elementary/src/lib/elm_diskselector.c
View File

@ -83,12 +83,13 @@ _item_select(Elm_Diskselector_Item_Data *it)
if (!it) return;
ELM_DISKSELECTOR_DATA_GET(WIDGET(it), sd);
Elm_Object_Item *eo_it = EO_OBJ(it);
sd->selected_item = it;
_selected_item_indicate(sd->selected_item);
if (it->func) it->func((void *)WIDGET_ITEM_DATA_GET(EO_OBJ(it)), WIDGET(it), EO_OBJ(it));
evas_object_smart_callback_call(WIDGET(it), SIG_SELECTED, EO_OBJ(it));
if (it->func) it->func((void *)WIDGET_ITEM_DATA_GET(eo_it), WIDGET(it), eo_it);
evas_object_smart_callback_call(WIDGET(it), SIG_SELECTED, eo_it);
}
static int
@ -594,6 +595,7 @@ _item_click_cb(void *data,
if (!it) return;
ELM_DISKSELECTOR_DATA_GET(WIDGET(it), sd);
Elm_Object_Item *eo_it = EO_OBJ(it);
if (sd->selected_item != it)
{
@ -601,8 +603,8 @@ _item_click_cb(void *data,
_selected_item_indicate(sd->selected_item);
}
if (it->func) it->func((void *)WIDGET_ITEM_DATA_GET(EO_OBJ(it)), WIDGET(it), EO_OBJ(it));
evas_object_smart_callback_call(WIDGET(it), SIG_CLICKED, EO_OBJ(it));
if (it->func) it->func((void *)WIDGET_ITEM_DATA_GET(eo_it), WIDGET(it), eo_it);
evas_object_smart_callback_call(WIDGET(it), SIG_CLICKED, eo_it);
}
static char *
@ -659,7 +661,7 @@ _item_new(Evas_Object *obj,
it->label = eina_stringshare_add(label);
it->func = func;
WIDGET_ITEM_DATA_SET(EO_OBJ(it), data);
WIDGET_ITEM_DATA_SET(eo_it, data);
VIEW(it) = edje_object_add(evas_object_evas_get(obj));
elm_widget_theme_object_set(obj, VIEW(it), "diskselector", "item",
elm_widget_style_get(obj));

4
legacy/elementary/src/lib/elm_flipselector.c
View File

@ -229,7 +229,7 @@ _on_item_changed(Elm_Flipselector_Data *sd)
if (sd->deleting) return;
if (item->func)
item->func((void *)WIDGET_ITEM_DATA_GET(EO_OBJ(item)), WIDGET(item), eo_item);
item->func((void *)WIDGET_ITEM_DATA_GET(eo_item), WIDGET(item), eo_item);
evas_object_smart_callback_call
(sd->obj, SIG_SELECTED, eo_item);
}
@ -321,7 +321,7 @@ _item_new(Evas_Object *obj,
it->label = eina_stringshare_add_length(label, len);
it->func = func;
WIDGET_ITEM_DATA_SET(EO_OBJ(it), data);
WIDGET_ITEM_DATA_SET(eo_item, data);
/* TODO: no view here, but if one desires general contents in the
* future... */