From: Enlightenment S. <no-...@en...> - 2011-12-01 19:14:56
|
Log: +elm_toolbar_item_icon_file_set() at some point this whole item api should probably be replaced with generic object stuff Author: discomfitor Date: 2011-12-01 11:14:48 -0800 (Thu, 01 Dec 2011) New Revision: 65785 Trac: http://trac.enlightenment.org/e/changeset/65785 Modified: trunk/elementary/src/lib/Elementary.h.in trunk/elementary/src/lib/elm_toolbar.c Modified: trunk/elementary/src/lib/Elementary.h.in =================================================================== --- trunk/elementary/src/lib/Elementary.h.in 2011-12-01 16:53:57 UTC (rev 65784) +++ trunk/elementary/src/lib/Elementary.h.in 2011-12-01 19:14:48 UTC (rev 65785) @@ -15185,7 +15185,8 @@ * @param it The toolbar item. * @return The icon object * - * @see elm_toolbar_item_icon_set() or elm_toolbar_item_icon_memfile_set() for details. + * @see elm_toolbar_item_icon_set(), elm_toolbar_item_icon_file_set(), + * or elm_toolbar_item_icon_memfile_set() for details. * * @ingroup Toolbar */ @@ -15207,7 +15208,24 @@ * @ingroup Toolbar */ EAPI Eina_Bool elm_toolbar_item_icon_memfile_set(Elm_Object_Item *it, const void *img, size_t size, const char *format, const char *key) EINA_ARG_NONNULL(1); + /** + * Set the icon associated with @p item to an image in a binary buffer. + * + * @param it The toolbar item. + * @param file The file that contains the image + * @param key Optional key of @p img to pass to the image loader (eg. if @p img is an edje file) + * + * @return (@c EINA_TRUE = success, @c EINA_FALSE = error) + * + * @note The icon image set by this function can be changed by + * elm_toolbar_item_icon_set(). + * + * @ingroup Toolbar + */ + EAPI Eina_Bool elm_toolbar_item_icon_file_set(Elm_Object_Item *it, const char *file, const char *key) EINA_ARG_NONNULL(1); + + /** * Delete them item from the toolbar. * * @param it The item of toolbar to be deleted. Modified: trunk/elementary/src/lib/elm_toolbar.c =================================================================== --- trunk/elementary/src/lib/elm_toolbar.c 2011-12-01 16:53:57 UTC (rev 65784) +++ trunk/elementary/src/lib/elm_toolbar.c 2011-12-01 19:14:48 UTC (rev 65785) @@ -1391,6 +1391,39 @@ return EINA_TRUE; } +EAPI Eina_Bool +elm_toolbar_item_icon_file_set(Elm_Object_Item *it, const char *file, const char *key) +{ + ELM_OBJ_ITEM_CHECK_OR_RETURN(it, EINA_FALSE); + + Evas_Object *icon_obj; + Widget_Data *wd; + Evas_Object *obj; + Eina_Bool ret; + Elm_Toolbar_Item *item = (Elm_Toolbar_Item *) it; + + obj = WIDGET(item); + wd = elm_widget_data_get(obj); + if (!wd) return EINA_FALSE; + + if (file) + { + icon_obj = _els_smart_icon_add(evas_object_evas_get(obj)); + evas_object_repeat_events_set(icon_obj, EINA_TRUE); + ret = _els_smart_icon_file_key_set(icon_obj, file, key); + if (!ret) + { + evas_object_del(icon_obj); + return EINA_FALSE; + } + _elm_toolbar_item_icon_obj_set(obj, item, icon_obj, NULL, wd->icon_size, + "elm,state,icon_set"); + } + else + _elm_toolbar_item_icon_obj_set(obj, item, NULL, NULL, 0, "elm,state,icon_set"); + return EINA_TRUE; +} + EAPI void elm_toolbar_item_del(Elm_Object_Item *it) { |