hoversel, popup, colorselector: Optimize eo item usage.

Remove unnecessary pointer reference.
This commit is contained in:
Daniel Juyung Seo 2014-11-25 21:54:24 +09:00
parent 9b9a0267b7
commit fb4b67afb5
3 changed files with 9 additions and 8 deletions

View File

@ -104,9 +104,10 @@ _on_item_clicked(void *data,
{
Elm_Hoversel_Item_Data *item = data;
Evas_Object *obj2 = WIDGET(item);
Elm_Object_Item *eo_it = EO_OBJ(item);
if (item->func) item->func((void *)WIDGET_ITEM_DATA_GET(EO_OBJ(item)), obj2, EO_OBJ(item));
evas_object_smart_callback_call(obj2, SIG_SELECTED, EO_OBJ(item));
if (item->func) item->func((void *)WIDGET_ITEM_DATA_GET(eo_it), obj2, eo_it);
evas_object_smart_callback_call(obj2, SIG_SELECTED, eo_it);
elm_hoversel_hover_end(obj2);
}
@ -466,7 +467,7 @@ _elm_hoversel_item_add(Eo *obj, Elm_Hoversel_Data *sd, const char *label, const
item->icon_file = eina_stringshare_add(icon_file);
item->icon_type = icon_type;
item->func = func;
WIDGET_ITEM_DATA_SET(EO_OBJ(item), data);
WIDGET_ITEM_DATA_SET(eo_item, data);
sd->items = eina_list_append(sd->items, eo_item);

View File

@ -1658,7 +1658,7 @@ _elm_popup_item_append(Eo *obj, Elm_Popup_Data *sd, const char *label, Evas_Obje
_list_add(obj);
it->func = func;
WIDGET_ITEM_DATA_SET(EO_OBJ(it), data);
WIDGET_ITEM_DATA_SET(eo_it, data);
_item_new(it);
_item_icon_set(it, icon);
@ -1670,7 +1670,7 @@ _elm_popup_item_append(Eo *obj, Elm_Popup_Data *sd, const char *label, Evas_Obje
_scroller_size_calc(obj);
elm_layout_sizing_eval(obj);
return EO_OBJ(it);
return eo_it;
}
static void

View File

@ -1505,7 +1505,7 @@ _palette_colors_load(Evas_Object *obj)
(item->color->b * item->color->a) / 255,
item->color->a);
sd->items = eina_list_append(sd->items, EO_OBJ(item));
sd->items = eina_list_append(sd->items, eo_item);
}
sd->config_load = EINA_TRUE;
@ -1779,7 +1779,7 @@ _key_action_move(Evas_Object *obj, const char *params)
(WIDGET(item), item->color->r, item->color->g, item->color->b,
item->color->a);
evas_object_smart_callback_call
(WIDGET(item), SIG_COLOR_ITEM_SELECTED, EO_OBJ(item));
(WIDGET(item), SIG_COLOR_ITEM_SELECTED, eo_item);
sd->selected = cl;
}
else if (!cl && sd->focused == ELM_COLORSELECTOR_PALETTE)
@ -2086,7 +2086,7 @@ _elm_colorselector_palette_color_add(Eo *obj, Elm_Colorselector_Data *sd, int r,
elm_layout_sizing_eval(obj);
return EO_OBJ(item);
return eo_item;
}
EOLIAN static void