From: Gustavo Lima Chaves Date: Thu, 3 May 2012 22:43:00 +0000 (+0000) Subject: [Elm] Hoversel is now a button. X-Git-Tag: v1.7.0~754 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9994dacbd2e1ee2e93cb454dc6cc4bbcf09685a6;p=platform%2Fupstream%2Felementary.git [Elm] Hoversel is now a button. SVN revision: 70725 --- diff --git a/src/lib/elc_hoversel.c b/src/lib/elc_hoversel.c index fb07d78..dcb6c4a 100644 --- a/src/lib/elc_hoversel.c +++ b/src/lib/elc_hoversel.c @@ -1,203 +1,195 @@ #include #include "elm_priv.h" +#include "elm_widget_button.h" -typedef struct _Widget_Data Widget_Data; -typedef struct _Elm_Hoversel_Item Elm_Hoversel_Item; +static const char HOVERSEL_SMART_NAME[] = "elm_hoversel"; -struct _Widget_Data +typedef struct _Elm_Hoversel_Smart_Data Elm_Hoversel_Smart_Data; +typedef struct _Elm_Hoversel_Item Elm_Hoversel_Item; + +struct _Elm_Hoversel_Smart_Data { - Evas_Object *btn, *hover; - Evas_Object *hover_parent; - Eina_List *items; - Eina_Bool horizontal : 1; - Eina_Bool expanded : 1; + Elm_Button_Smart_Data base; + + /* aggregates a hover */ + Evas_Object *hover; + Evas_Object *hover_parent; + + Eina_List *items; + + Eina_Bool horizontal : 1; + Eina_Bool expanded : 1; }; struct _Elm_Hoversel_Item { ELM_WIDGET_ITEM; - const char *label; - const char *icon_file; - const char *icon_group; + + const char *label; + const char *icon_file; + const char *icon_group; + Elm_Icon_Type icon_type; Evas_Smart_Cb func; }; -static const char *widtype = NULL; -static void _del_pre_hook(Evas_Object *obj); -static void _del_hook(Evas_Object *obj); -static void _activate(Evas_Object *obj); -static void _activate_hook(Evas_Object *obj); -static void _disable_hook(Evas_Object *obj); -static void _sizing_eval(Evas_Object *obj); -static void _changed_size_hints(void *data, Evas *e, Evas_Object *obj, void *event_info); -static void _parent_del(void *data, Evas *e, Evas_Object *obj, void *event_info); - -static const char SIG_CLICKED[] = "clicked"; +#define ELM_HOVERSEL_DATA_GET(o, sd) \ + Elm_Hoversel_Smart_Data * sd = evas_object_smart_data_get(o) + +#define ELM_HOVERSEL_DATA_GET_OR_RETURN(o, ptr) \ + ELM_HOVERSEL_DATA_GET(o, ptr); \ + if (!ptr) \ + { \ + CRITICAL("No widget data for object %p (%s)", \ + o, evas_object_type_get(o)); \ + return; \ + } + +#define ELM_HOVERSEL_DATA_GET_OR_RETURN_VAL(o, ptr, val) \ + ELM_HOVERSEL_DATA_GET(o, ptr); \ + if (!ptr) \ + { \ + CRITICAL("No widget data for object %p (%s)", \ + o, evas_object_type_get(o)); \ + return val; \ + } + +#define ELM_HOVERSEL_CHECK(obj) \ + if (!obj || !elm_widget_type_check((obj), HOVERSEL_SMART_NAME, __func__)) \ + return + +#define ELM_HOVERSEL_ITEM_CHECK(it) \ + ELM_WIDGET_ITEM_CHECK_OR_RETURN((Elm_Widget_Item *)it, ); \ + ELM_HOVERSEL_CHECK(it->base.widget); + +#define ELM_HOVERSEL_ITEM_CHECK_OR_RETURN(it, ...) \ + ELM_WIDGET_ITEM_CHECK_OR_RETURN((Elm_Widget_Item *)it, __VA_ARGS__); \ + ELM_HOVERSEL_CHECK(it->base.widget) __VA_ARGS__; + static const char SIG_SELECTED[] = "selected"; static const char SIG_DISMISSED[] = "dismissed"; - -static const Evas_Smart_Cb_Description _signals[] = { - {SIG_CLICKED, ""}, +static const Evas_Smart_Cb_Description _smart_callbacks[] = { {SIG_SELECTED, ""}, {SIG_DISMISSED, ""}, {NULL, NULL} }; -static void -_del_pre_hook(Evas_Object *obj) -{ - Elm_Hoversel_Item *item; - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - evas_object_event_callback_del_full(wd->btn, EVAS_CALLBACK_CHANGED_SIZE_HINTS, - _changed_size_hints, obj); - elm_hoversel_hover_end(obj); - elm_hoversel_hover_parent_set(obj, NULL); - EINA_LIST_FREE(wd->items, item) - { - eina_stringshare_del(item->label); - eina_stringshare_del(item->icon_file); - eina_stringshare_del(item->icon_group); - elm_widget_item_free(item); - } -} +EVAS_SMART_SUBCLASS_NEW + (HOVERSEL_SMART_NAME, _elm_hoversel, Elm_Button_Smart_Class, + Elm_Button_Smart_Class, elm_button_smart_class_get, _smart_callbacks); -static void -_del_hook(Evas_Object *obj) +static Eina_Bool +_elm_hoversel_smart_theme(Evas_Object *obj) { - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - free(wd); -} + char buf[4096]; + const char *style; -static void -_mirrored_set(Evas_Object *obj, Eina_Bool rtl) -{ - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - elm_widget_mirrored_set(wd->btn, rtl); - elm_widget_mirrored_set(wd->hover, rtl); -} + ELM_HOVERSEL_DATA_GET(obj, sd); -static void -_theme_hook(Evas_Object *obj) -{ - Widget_Data *wd = elm_widget_data_get(obj); - char buf[4096]; - if (!wd) return; - _elm_widget_mirrored_reload(obj); + style = eina_stringshare_add(elm_widget_style_get(obj)); - elm_hoversel_hover_end(obj); - if (wd->horizontal) - snprintf(buf, sizeof(buf), "hoversel_horizontal/%s", elm_widget_style_get(obj)); + if (sd->horizontal) + snprintf(buf, sizeof(buf), "hoversel_horizontal/%s", style); else - snprintf(buf, sizeof(buf), "hoversel_vertical/%s", elm_widget_style_get(obj)); - elm_object_style_set(wd->btn, buf); - elm_object_disabled_set(wd->btn, elm_widget_disabled_get(obj)); - _mirrored_set(obj, elm_widget_mirrored_get(obj)); -} + snprintf(buf, sizeof(buf), "hoversel_vertical/%s", style); -static void -_disable_hook(Evas_Object *obj) -{ - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - elm_object_disabled_set(wd->btn, elm_widget_disabled_get(obj)); -} + /* hoversel's style has an extra bit: orientation */ + eina_stringshare_replace(&(ELM_WIDGET_DATA(sd)->style), buf); -static void -_sizing_eval(Evas_Object *obj) -{ - Widget_Data *wd = elm_widget_data_get(obj); - Evas_Coord minw = -1, minh = -1, maxw = -1, maxh = -1; - if (!wd) return; - evas_object_size_hint_min_get(wd->btn, &minw, &minh); - evas_object_size_hint_max_get(wd->btn, &maxw, &maxh); - evas_object_size_hint_min_set(obj, minw, minh); - evas_object_size_hint_max_set(obj, maxw, maxh); -} + if (!ELM_WIDGET_CLASS(_elm_hoversel_parent_sc)->theme(obj)) + return EINA_FALSE; -static void -_on_focus_hook(void *data __UNUSED__, Evas_Object *obj) -{ - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - if (elm_widget_focus_get(obj)) - elm_widget_focus_steal(wd->btn); -} + eina_stringshare_replace(&(ELM_WIDGET_DATA(sd)->style), style); -static void -_changed_size_hints(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) -{ - _sizing_eval(data); + eina_stringshare_del(style); + + if (sd->hover) + elm_widget_mirrored_set(sd->hover, elm_widget_mirrored_get(obj)); + + elm_hoversel_hover_end(obj); + + return EINA_TRUE; } static void -_hover_clicked(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_on_hover_clicked(void *data, + Evas_Object *obj __UNUSED__, + void *event_info __UNUSED__) { elm_hoversel_hover_end(data); } static void -_item_clicked(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_on_item_clicked(void *data, + Evas_Object *obj __UNUSED__, + void *event_info __UNUSED__) { Elm_Hoversel_Item *item = data; Evas_Object *obj2 = WIDGET(item); - elm_hoversel_hover_end(obj2); if (item->func) item->func((void *)item->base.data, obj2, item); evas_object_smart_callback_call(obj2, SIG_SELECTED, item); + elm_hoversel_hover_end(obj2); } static void _activate(Evas_Object *obj) { - Widget_Data *wd = elm_widget_data_get(obj); + const Elm_Hoversel_Item *item; Evas_Object *bt, *bx, *ic; const Eina_List *l; - const Elm_Hoversel_Item *item; char buf[4096]; - if (!wd) return; - if (wd->expanded) + ELM_HOVERSEL_DATA_GET(obj, sd); + + if (sd->expanded) { elm_hoversel_hover_end(obj); return; } - wd->expanded = EINA_TRUE; + sd->expanded = EINA_TRUE; if (elm_widget_disabled_get(obj)) return; - wd->hover = elm_hover_add(obj); - elm_widget_mirrored_automatic_set(wd->hover, EINA_FALSE); - if (wd->horizontal) - snprintf(buf, sizeof(buf), "hoversel_horizontal/%s", elm_widget_style_get(obj)); + + printf("creating hover!!\n"); + + sd->hover = elm_hover_add(sd->hover_parent); + elm_widget_mirrored_automatic_set(sd->hover, EINA_FALSE); + + if (sd->horizontal) + snprintf(buf, sizeof(buf), "hoversel_horizontal/%s", + elm_widget_style_get(obj)); else - snprintf(buf, sizeof(buf), "hoversel_vertical/%s", elm_widget_style_get(obj)); - elm_object_style_set(wd->hover, buf); - evas_object_smart_callback_add(wd->hover, "clicked", _hover_clicked, obj); - elm_hover_parent_set(wd->hover, wd->hover_parent); - elm_hover_target_set(wd->hover, wd->btn); + snprintf(buf, sizeof(buf), "hoversel_vertical/%s", + elm_widget_style_get(obj)); - bx = elm_box_add(wd->hover); - elm_widget_mirrored_automatic_set(bx, EINA_FALSE); - elm_box_homogeneous_set(bx, 1); + elm_object_style_set(sd->hover, buf); + + evas_object_smart_callback_add + (sd->hover, "clicked", _on_hover_clicked, obj); + elm_hover_target_set(sd->hover, obj); - elm_box_horizontal_set(bx, wd->horizontal); + /* hover's content */ + bx = elm_box_add(sd->hover); + elm_widget_mirrored_automatic_set(bx, EINA_FALSE); + elm_box_homogeneous_set(bx, EINA_TRUE); + elm_box_horizontal_set(bx, sd->horizontal); - if (wd->horizontal) + if (sd->horizontal) snprintf(buf, sizeof(buf), "hoversel_horizontal_entry/%s", elm_widget_style_get(obj)); else snprintf(buf, sizeof(buf), "hoversel_vertical_entry/%s", elm_widget_style_get(obj)); - EINA_LIST_FOREACH(wd->items, l, item) + + EINA_LIST_FOREACH (sd->items, l, item) { - bt = elm_button_add(wd->hover); + bt = elm_button_add(bx); elm_widget_mirrored_automatic_set(bt, EINA_FALSE); elm_widget_mirrored_set(bt, elm_widget_mirrored_get(obj)); elm_object_style_set(bt, buf); elm_object_text_set(bt, item->label); + if (item->icon_file) { ic = elm_icon_add(obj); @@ -207,239 +199,216 @@ _activate(Evas_Object *obj) else if (item->icon_type == ELM_ICON_STANDARD) elm_icon_standard_set(ic, item->icon_file); elm_object_part_content_set(bt, "icon", ic); - evas_object_show(ic); } + evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_box_pack_end(bx, bt); - evas_object_smart_callback_add(bt, "clicked", _item_clicked, item); + evas_object_smart_callback_add(bt, "clicked", _on_item_clicked, item); evas_object_show(bt); } - if (wd->horizontal) - elm_object_part_content_set(wd->hover, - elm_hover_best_content_location_get(wd->hover, - ELM_HOVER_AXIS_HORIZONTAL), - bx); + if (sd->horizontal) + elm_object_part_content_set(sd->hover, elm_hover_best_content_location_get + (sd->hover, ELM_HOVER_AXIS_HORIZONTAL), bx); else - elm_object_part_content_set(wd->hover, - elm_hover_best_content_location_get(wd->hover, - ELM_HOVER_AXIS_VERTICAL), - bx); - evas_object_show(bx); - - evas_object_show(wd->hover); - evas_object_smart_callback_call(obj, SIG_CLICKED, NULL); - - // if (wd->horizontal) evas_object_hide(wd->btn); -} + elm_object_part_content_set(sd->hover, elm_hover_best_content_location_get + (sd->hover, ELM_HOVER_AXIS_VERTICAL), bx); -static void -_activate_hook(Evas_Object *obj) -{ - _activate(obj); + evas_object_show(sd->hover); } static void -_button_clicked(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_on_clicked(void *data, + Evas_Object *obj __UNUSED__, + void *event_info __UNUSED__) { _activate(data); } static void -_parent_del(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) +_on_parent_del(void *data, + Evas *e __UNUSED__, + Evas_Object *obj __UNUSED__, + void *event_info __UNUSED__) { - Widget_Data *wd = elm_widget_data_get(data); - if (!wd) return; - wd->hover_parent = NULL; -} + ELM_HOVERSEL_DATA_GET(data, sd); -static void -_elm_hoversel_label_set(Evas_Object *obj, const char *item, const char *label) -{ - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - if (item && strcmp(item, "default")) return; - if (!wd) return; - elm_object_text_set(wd->btn, label); + sd->hover_parent = NULL; } static const char * -_elm_hoversel_label_get(const Evas_Object *obj, const char *item) +_item_text_get_hook(const Elm_Object_Item *it, + const char *part) { - ELM_CHECK_WIDTYPE(obj, widtype) NULL; - Widget_Data *wd = elm_widget_data_get(obj); - if (item && strcmp(item, "default")) return NULL; - if ((!wd) || (!wd->btn)) return NULL; - return elm_object_text_get(wd->btn); + if (part && strcmp(part, "default")) return NULL; + return ((Elm_Hoversel_Item *)it)->label; } -static void -_content_set_hook(Evas_Object *obj, const char *part, Evas_Object *content) +static Eina_Bool +_item_del_pre_hook(Elm_Object_Item *it) { - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; + Elm_Hoversel_Item *item = (Elm_Hoversel_Item *)it; - elm_object_part_content_set(wd->btn, part, content); -} + ELM_HOVERSEL_DATA_GET_OR_RETURN_VAL(WIDGET(item), sd, EINA_FALSE); -static Evas_Object * -_content_get_hook(const Evas_Object *obj, const char *part) -{ - ELM_CHECK_WIDTYPE(obj, widtype) NULL; - Widget_Data *wd = elm_widget_data_get(obj); - if ((!wd) || (!wd->btn)) return NULL; - return elm_object_part_content_get(wd->btn, part); + elm_hoversel_hover_end(WIDGET(item)); + sd->items = eina_list_remove(sd->items, item); + eina_stringshare_del(item->label); + eina_stringshare_del(item->icon_file); + eina_stringshare_del(item->icon_group); + + return EINA_TRUE; } -static Evas_Object * -_content_unset_hook(Evas_Object *obj, const char *part) +static void +_elm_hoversel_smart_add(Evas_Object *obj) { - ELM_CHECK_WIDTYPE(obj, widtype) NULL; - Widget_Data *wd = elm_widget_data_get(obj); - if ((!wd) || (!wd->btn)) return NULL; - return elm_object_part_content_unset(wd->btn, part); + EVAS_SMART_DATA_ALLOC(obj, Elm_Hoversel_Smart_Data); + + ELM_WIDGET_CLASS(_elm_hoversel_parent_sc)->base.add(obj); + + elm_widget_mirrored_automatic_set(obj, EINA_FALSE); + + priv->expanded = EINA_FALSE; + + evas_object_smart_callback_add(obj, "clicked", _on_clicked, obj); + + _elm_hoversel_smart_theme(obj); } -static const char * -_item_text_get_hook(const Elm_Object_Item *it, const char *part) +static void +_elm_hoversel_smart_del(Evas_Object *obj) { - if (part && strcmp(part, "default")) return NULL; - return ((Elm_Hoversel_Item *)it)->label; + Elm_Hoversel_Item *item; + + ELM_HOVERSEL_DATA_GET(obj, sd); + + EINA_LIST_FREE (sd->items, item) + { + eina_stringshare_del(item->label); + eina_stringshare_del(item->icon_file); + eina_stringshare_del(item->icon_group); + elm_widget_item_free(item); + } + + ELM_WIDGET_CLASS(_elm_hoversel_parent_sc)->base.del(obj); } -static Eina_Bool -_item_del_pre_hook(Elm_Object_Item *it) +static void +_elm_hoversel_smart_set_user(Elm_Button_Smart_Class *sc) { - Widget_Data *wd; - Elm_Hoversel_Item *item = (Elm_Hoversel_Item *)it; - wd = elm_widget_data_get(WIDGET(item)); - if (!wd) return EINA_FALSE; - elm_hoversel_hover_end(WIDGET(item)); - wd->items = eina_list_remove(wd->items, item); - eina_stringshare_del(item->label); - eina_stringshare_del(item->icon_file); - eina_stringshare_del(item->icon_group); + ELM_WIDGET_CLASS(sc)->base.add = _elm_hoversel_smart_add; + ELM_WIDGET_CLASS(sc)->base.del = _elm_hoversel_smart_del; - return EINA_TRUE; + ELM_WIDGET_CLASS(sc)->theme = _elm_hoversel_smart_theme; + + sc->admits_autorepeat = EINA_FALSE; } EAPI Evas_Object * elm_hoversel_add(Evas_Object *parent) { - Evas_Object *obj; Evas *e; - Widget_Data *wd; - - ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); - - ELM_SET_WIDTYPE(widtype, "hoversel"); - elm_widget_type_set(obj, "hoversel"); - elm_widget_sub_object_add(parent, obj); - elm_widget_data_set(obj, wd); - elm_widget_del_pre_hook_set(obj, _del_pre_hook); - elm_widget_del_hook_set(obj, _del_hook); - elm_widget_theme_hook_set(obj, _theme_hook); - elm_widget_disable_hook_set(obj, _disable_hook); - elm_widget_activate_hook_set(obj, _activate_hook); - elm_widget_on_focus_hook_set(obj, _on_focus_hook, NULL); - elm_widget_can_focus_set(obj, EINA_TRUE); - elm_widget_text_set_hook_set(obj, _elm_hoversel_label_set); - elm_widget_text_get_hook_set(obj, _elm_hoversel_label_get); - elm_widget_content_set_hook_set(obj, _content_set_hook); - elm_widget_content_get_hook_set(obj, _content_get_hook); - elm_widget_content_unset_hook_set(obj, _content_unset_hook); - - wd->btn = elm_button_add(parent); - elm_widget_mirrored_automatic_set(wd->btn, EINA_FALSE); - wd->expanded = EINA_FALSE; - elm_widget_resize_object_set(obj, wd->btn); - evas_object_event_callback_add(wd->btn, EVAS_CALLBACK_CHANGED_SIZE_HINTS, - _changed_size_hints, obj); - evas_object_smart_callback_add(wd->btn, "clicked", _button_clicked, obj); - evas_object_smart_callbacks_descriptions_set(obj, _signals); - - elm_widget_sub_object_add(obj, wd->btn); + Evas_Object *obj; + + EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); + + e = evas_object_evas_get(parent); + if (!e) return NULL; + + obj = evas_object_smart_add(e, _elm_hoversel_smart_class_new()); + + if (!elm_widget_sub_object_add(parent, obj)) + ERR("could not add %p as sub object of %p", obj, parent); elm_hoversel_hover_parent_set(obj, parent); - _theme_hook(obj); return obj; } EAPI void -elm_hoversel_hover_parent_set(Evas_Object *obj, Evas_Object *parent) +elm_hoversel_hover_parent_set(Evas_Object *obj, + Evas_Object *parent) { - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - if (wd->hover_parent) - evas_object_event_callback_del_full(wd->hover_parent, EVAS_CALLBACK_DEL, - _parent_del, obj); - wd->hover_parent = parent; - if (wd->hover_parent) - evas_object_event_callback_add(wd->hover_parent, EVAS_CALLBACK_DEL, - _parent_del, obj); + ELM_HOVERSEL_CHECK(obj); + ELM_HOVERSEL_DATA_GET(obj, sd); + + if (sd->hover_parent) + evas_object_event_callback_del_full + (sd->hover_parent, EVAS_CALLBACK_DEL, _on_parent_del, obj); + + sd->hover_parent = parent; + if (sd->hover_parent) + evas_object_event_callback_add + (sd->hover_parent, EVAS_CALLBACK_DEL, _on_parent_del, obj); } EAPI Evas_Object * elm_hoversel_hover_parent_get(const Evas_Object *obj) { - ELM_CHECK_WIDTYPE(obj, widtype) NULL; - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return NULL; - return wd->hover_parent; + ELM_HOVERSEL_CHECK(obj) NULL; + ELM_HOVERSEL_DATA_GET(obj, sd); + + return sd->hover_parent; } EAPI void -elm_hoversel_horizontal_set(Evas_Object *obj, Eina_Bool horizontal) +elm_hoversel_horizontal_set(Evas_Object *obj, + Eina_Bool horizontal) { - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - wd->horizontal = !!horizontal; + ELM_HOVERSEL_CHECK(obj); + ELM_HOVERSEL_DATA_GET(obj, sd); + + sd->horizontal = !!horizontal; + + _elm_hoversel_smart_theme(obj); } EAPI Eina_Bool elm_hoversel_horizontal_get(const Evas_Object *obj) { - ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE; - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return EINA_FALSE; - return wd->horizontal; + ELM_HOVERSEL_CHECK(obj) EINA_FALSE; + ELM_HOVERSEL_DATA_GET(obj, sd); + + return sd->horizontal; } EAPI void elm_hoversel_hover_begin(Evas_Object *obj) { - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - if (wd->hover) return; + ELM_HOVERSEL_CHECK(obj); + ELM_HOVERSEL_DATA_GET(obj, sd); + + if (sd->hover) return; + _activate(obj); } EAPI void elm_hoversel_hover_end(Evas_Object *obj) { - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - if (!wd->hover) return; - wd->expanded = EINA_FALSE; - evas_object_del(wd->hover); - wd->hover = NULL; + ELM_HOVERSEL_CHECK(obj); + ELM_HOVERSEL_DATA_GET(obj, sd); + + if (!sd->hover) return; + + sd->expanded = EINA_FALSE; + + printf("deleting hover!!\n"); + evas_object_del(sd->hover); + sd->hover = NULL; + evas_object_smart_callback_call(obj, SIG_DISMISSED, NULL); } EAPI Eina_Bool elm_hoversel_expanded_get(const Evas_Object *obj) { - ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE; - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return EINA_FALSE; - return (wd->hover) ? EINA_TRUE : EINA_FALSE; + ELM_HOVERSEL_CHECK(obj) EINA_FALSE; + ELM_HOVERSEL_DATA_GET(obj, sd); + + return (sd->hover) ? EINA_TRUE : EINA_FALSE; } EAPI void @@ -447,61 +416,80 @@ elm_hoversel_clear(Evas_Object *obj) { Elm_Object_Item *it; Eina_List *l, *ll; - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - EINA_LIST_FOREACH_SAFE(wd->items, l, ll, it) + + ELM_HOVERSEL_CHECK(obj); + ELM_HOVERSEL_DATA_GET(obj, sd); + + EINA_LIST_FOREACH_SAFE (sd->items, l, ll, it) { - _item_del_pre_hook(it); - elm_widget_item_free(it); + elm_widget_item_del(it); } } EAPI const Eina_List * elm_hoversel_items_get(const Evas_Object *obj) { - ELM_CHECK_WIDTYPE(obj, widtype) NULL; - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return NULL; - return wd->items; + ELM_HOVERSEL_CHECK(obj) NULL; + ELM_HOVERSEL_DATA_GET(obj, sd); + + return sd->items; } EAPI Elm_Object_Item * -elm_hoversel_item_add(Evas_Object *obj, const char *label, const char *icon_file, Elm_Icon_Type icon_type, Evas_Smart_Cb func, const void *data) +elm_hoversel_item_add(Evas_Object *obj, + const char *label, + const char *icon_file, + Elm_Icon_Type icon_type, + Evas_Smart_Cb func, + const void *data) { - ELM_CHECK_WIDTYPE(obj, widtype) NULL; - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return NULL; + ELM_HOVERSEL_CHECK(obj) NULL; + ELM_HOVERSEL_DATA_GET(obj, sd); + Elm_Hoversel_Item *item = elm_widget_item_new(obj, Elm_Hoversel_Item); if (!item) return NULL; + elm_widget_item_del_pre_hook_set(item, _item_del_pre_hook); elm_widget_item_text_get_hook_set(item, _item_text_get_hook); - wd->items = eina_list_append(wd->items, item); + item->label = eina_stringshare_add(label); item->icon_file = eina_stringshare_add(icon_file); item->icon_type = icon_type; item->func = func; item->base.data = data; + + sd->items = eina_list_append(sd->items, item); + return (Elm_Object_Item *)item; } EAPI void -elm_hoversel_item_icon_set(Elm_Object_Item *it, const char *icon_file, const char *icon_group, Elm_Icon_Type icon_type) +elm_hoversel_item_icon_set(Elm_Object_Item *it, + const char *icon_file, + const char *icon_group, + Elm_Icon_Type icon_type) { - ELM_OBJ_ITEM_CHECK_OR_RETURN(it); + ELM_HOVERSEL_ITEM_CHECK_OR_RETURN(it); + Elm_Hoversel_Item *item = (Elm_Hoversel_Item *)it; + eina_stringshare_replace(&item->icon_file, icon_file); eina_stringshare_replace(&item->icon_group, icon_group); + item->icon_type = icon_type; } EAPI void -elm_hoversel_item_icon_get(const Elm_Object_Item *it, const char **icon_file, const char **icon_group, Elm_Icon_Type *icon_type) +elm_hoversel_item_icon_get(const Elm_Object_Item *it, + const char **icon_file, + const char **icon_group, + Elm_Icon_Type *icon_type) { - ELM_OBJ_ITEM_CHECK_OR_RETURN(it); + ELM_HOVERSEL_ITEM_CHECK_OR_RETURN(it); + Elm_Hoversel_Item *item = (Elm_Hoversel_Item *)it; + if (icon_file) *icon_file = item->icon_file; if (icon_group) *icon_group = item->icon_group; if (icon_type) *icon_type = item->icon_type; } - diff --git a/src/lib/elc_hoversel.h b/src/lib/elc_hoversel.h index 1f60849..d54db05 100644 --- a/src/lib/elc_hoversel.h +++ b/src/lib/elc_hoversel.h @@ -12,10 +12,16 @@ * items in the hoversel menu (no more than 8), though is capable of many * more. * - * Signals that you can add callbacks for are: - * "clicked" - the user clicked the hoversel button and popped up the sel - * "selected" - an item in the hoversel list is selected. event_info is the item - * "dismissed" - the hover is dismissed + * This widget inherits from the @ref Button one, so that all the + * functions acting on it also work for hoversel objects. + * + * This widget emits the following signals, besides the ones sent from + * @ref Button: + * - @c "clicked" - the user clicked the hoversel button and popped up + * the sel + * - @c "selected" - an item in the hoversel list is selected. event_info + * is the item + * - @c "dismissed" - the hover is dismissed * * Default content parts of the hoversel widget that you can use for are: * @li "icon" - An icon of the hoversel