elementary - removed deprecated widgets & APIs.

[framework/uifw/elementary.git] / src / lib / elm_menu.c

diff --git a/src/lib/elm_menu.c b/src/lib/elm_menu.c
index e5a2bfd..33ee737 100644 (file)
--- a/src/lib/elm_menu.c
+++ b/src/lib/elm_menu.c
@@ -7,10 +7,11 @@ struct _Elm_Menu_Item
 {
    ELM_WIDGET_ITEM;
    Elm_Menu_Item *parent;
-   Evas_Object *icon;
+   Evas_Object *content;
    const char *icon_str;
    const char *label;
    Evas_Smart_Cb func;
+   unsigned int idx;
 
    struct {
       Evas_Object *hv, *bx, *location;
@@ -20,7 +21,8 @@ struct _Elm_Menu_Item
 
    Eina_Bool separator : 1;
    Eina_Bool disabled : 1;
-   Eina_Bool selected: 1;
+   Eina_Bool selected : 1;
+   Eina_Bool object_item : 1;
 };
 
 struct _Widget_Data
@@ -115,14 +117,14 @@ _theme_hook(Evas_Object *obj)
                      (obj, VIEW(item), "menu", "item_with_submenu",
                       elm_widget_style_get(obj));
                   elm_menu_item_label_set(item, item->label);
-                  elm_menu_item_icon_set(item, item->icon_str);
+                  elm_menu_item_object_icon_name_set(item, item->icon_str);
                }
              else
                {
                   _elm_theme_object_set(obj, VIEW(item), "menu", "item",
                                         elm_widget_style_get(obj));
                   elm_menu_item_label_set(item, item->label);
-                  elm_menu_item_icon_set(item, item->icon_str);
+                  elm_menu_item_object_icon_name_set(item, item->icon_str);
                }
              if (item->disabled)
                edje_object_signal_emit
@@ -418,7 +420,7 @@ _item_submenu_obj_create(Elm_Menu_Item *item)
    edje_object_mirrored_set(VIEW(item), elm_widget_mirrored_get(WIDGET(item)));
    _elm_theme_object_set(WIDGET(item), VIEW(item), "menu", "item_with_submenu",  elm_widget_style_get(WIDGET(item)));
    elm_menu_item_label_set(item, item->label);
-   elm_menu_item_icon_set(item, item->icon_str);
+   if (item->icon_str) elm_menu_item_object_icon_name_set(item, item->icon_str);
 
    edje_object_signal_callback_add(VIEW(item), "elm,action,open", "",
                                    _submenu_open, item);
@@ -579,6 +581,26 @@ elm_menu_clone(Evas_Object *from_menu, Evas_Object *to_menu, Elm_Menu_Item *pare
       _item_clone(to_menu, parent, item);
 }
 
+static void
+_elm_menu_item_add_helper(Evas_Object *obj, Elm_Menu_Item *parent, Elm_Menu_Item *subitem, Widget_Data *wd)
+{
+   if (parent)
+     {
+        if (!parent->submenu.bx) _item_submenu_obj_create(parent);
+        elm_box_pack_end(parent->submenu.bx, VIEW(subitem));
+        parent->submenu.items = eina_list_append(parent->submenu.items, subitem);
+        subitem->idx = eina_list_count(parent->submenu.items) - 1;
+     }
+   else
+     {
+        elm_box_pack_end(wd->bx, VIEW(subitem));
+        wd->items = eina_list_append(wd->items, subitem);
+        subitem->idx = eina_list_count(wd->items) - 1;
+     }
+
+   _sizing_eval(obj);
+}
+
 EAPI Elm_Menu_Item *
 elm_menu_item_add(Evas_Object *obj, Elm_Menu_Item *parent, const char *icon, const char *label, Evas_Smart_Cb func, const void *data)
 {
@@ -599,31 +621,55 @@ elm_menu_item_add(Evas_Object *obj, Elm_Menu_Item *parent, const char *icon, con
    subitem->base.data = data;
    subitem->func = func;
    subitem->parent = parent;
-   subitem->icon = icon_obj;
+   subitem->content = icon_obj;
 
    _item_obj_create(subitem);
    elm_menu_item_label_set(subitem, label);
 
-   elm_widget_sub_object_add(WIDGET(subitem), subitem->icon);
-   edje_object_part_swallow(VIEW(subitem), "elm.swallow.content", subitem->icon);
-   if (icon) elm_menu_item_icon_set(subitem, icon);
+   elm_widget_sub_object_add(WIDGET(subitem), subitem->content);
+   edje_object_part_swallow(VIEW(subitem), "elm.swallow.content", subitem->content);
+   if (icon) elm_menu_item_object_icon_name_set(subitem, icon);
 
-   if (parent)
-     {
-        if (!parent->submenu.bx) _item_submenu_obj_create(parent);
-        elm_box_pack_end(parent->submenu.bx, VIEW(subitem));
-        parent->submenu.items = eina_list_append(parent->submenu.items, subitem);
-     }
-   else
-     {
-        elm_box_pack_end(wd->bx, VIEW(subitem));
-        wd->items = eina_list_append(wd->items, subitem);
-     }
+   _elm_menu_item_add_helper(obj, parent, subitem, wd);
 
-   _sizing_eval(obj);
    return subitem;
 }
 
+EAPI Elm_Menu_Item *
+elm_menu_item_add_object(Evas_Object *obj, Elm_Menu_Item *parent, Evas_Object *subobj, Evas_Smart_Cb func, const void *data)
+{
+   Elm_Menu_Item *subitem;
+   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
+   Widget_Data *wd = elm_widget_data_get(obj);
+
+   if (!wd) return NULL;
+   subitem = elm_widget_item_new(obj, Elm_Menu_Item);
+   if (!subitem) return NULL;
+
+   subitem->base.data = data;
+   subitem->func = func;
+   subitem->parent = parent;
+   subitem->object_item = EINA_TRUE;
+   subitem->content = subobj;
+
+   _item_obj_create(subitem);
+
+   elm_widget_sub_object_add(WIDGET(subitem), subitem->content);
+   edje_object_part_swallow(VIEW(subitem), "elm.swallow.content", subobj);
+   _sizing_eval(WIDGET(subitem));
+
+   _elm_menu_item_add_helper(obj, parent, subitem, wd);
+
+   return subitem;
+}
+
+EAPI unsigned int
+elm_menu_item_index_get(const Elm_Menu_Item *item)
+{
+   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item, 0);
+   return item->idx;
+}
+
 EAPI void
 elm_menu_item_label_set(Elm_Menu_Item *item, const char *label)
 {
@@ -648,7 +694,7 @@ elm_menu_item_label_get(const Elm_Menu_Item *item)
 }
 
 EAPI void
-elm_menu_item_icon_set(Elm_Menu_Item *item, const char *icon)
+elm_menu_item_object_icon_name_set(Elm_Menu_Item *item, const char *icon)
 {
    char icon_tmp[512];
    ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item);
@@ -656,7 +702,8 @@ elm_menu_item_icon_set(Elm_Menu_Item *item, const char *icon)
    if (!*icon) return;
    if ((item->icon_str) && (!strcmp(item->icon_str, icon))) return;
    if ((snprintf(icon_tmp, sizeof(icon_tmp), "menu/%s", icon) > 0) &&
-       (elm_icon_standard_set(item->icon, icon_tmp)))
+       (elm_icon_standard_set(item->content, icon_tmp) ||
+        elm_icon_standard_set(item->content, icon)))
      {
         eina_stringshare_replace(&item->icon_str, icon);
         edje_object_signal_emit(VIEW(item), "elm,state,icon,visible", "elm");
@@ -724,15 +771,33 @@ elm_menu_item_separator_add(Evas_Object *obj, Elm_Menu_Item *parent)
    return subitem;
 }
 
-EAPI const Evas_Object *
-elm_menu_item_object_icon_get(const Elm_Menu_Item *item)
+EAPI Eina_Bool
+elm_menu_item_object_content_set(Elm_Menu_Item *item, Evas_Object *obj)
+{
+   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item, EINA_FALSE);
+   if (item->content)
+     {
+        elm_widget_sub_object_del(WIDGET(item), item->content);
+        evas_object_del(item->content);
+     }
+
+   item->content = obj;
+
+   elm_widget_sub_object_add(WIDGET(item), item->content);
+   edje_object_part_swallow(VIEW(item), "elm.swallow.content", item->content);
+   _sizing_eval(WIDGET(item));
+   return EINA_TRUE;
+}
+
+EAPI Evas_Object *
+elm_menu_item_object_content_get(const Elm_Menu_Item *item)
 {
    ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item, NULL);
-   return (const Evas_Object *)item->icon;
+   return item->content;
 }
 
 EAPI const char *
-elm_menu_item_icon_get(const Elm_Menu_Item *item)
+elm_menu_item_object_icon_name_get(const Elm_Menu_Item *item)
 {
    ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item, NULL);
    return item->icon_str;
@@ -755,7 +820,7 @@ elm_menu_item_del(Elm_Menu_Item *item)
 
    EINA_LIST_FREE(item->submenu.items, _item) elm_menu_item_del(_item);
    if (item->label) eina_stringshare_del(item->label);
-   if (item->icon) evas_object_del(item->icon);
+   if (item->content) evas_object_del(item->content);
    if (item->submenu.hv) evas_object_del(item->submenu.hv);
    if (item->submenu.location) evas_object_del(item->submenu.location);
 
@@ -846,7 +911,7 @@ elm_menu_item_prev_get(const Elm_Menu_Item *it)
    else
      {
         Widget_Data *wd = elm_widget_data_get(WIDGET(it));
-        if (!wd | !wd->items) return NULL;
+        if (!wd || !wd->items) return NULL;
         Eina_List *l = eina_list_data_find_list(wd->items, it);
         l = eina_list_prev(l);
         if (!l) return NULL;
@@ -869,7 +934,7 @@ elm_menu_item_next_get(const Elm_Menu_Item *it)
    else
      {
         Widget_Data *wd = elm_widget_data_get(WIDGET(it));
-        if (!wd | !wd->items) return NULL;
+        if (!wd || !wd->items) return NULL;
         Eina_List *l = eina_list_data_find_list(wd->items, it);
         l = eina_list_next(l);
         if (!l) return NULL;
@@ -878,6 +943,13 @@ elm_menu_item_next_get(const Elm_Menu_Item *it)
    return NULL;
 }
 
+EAPI Evas_Object *
+elm_menu_item_menu_get(const Elm_Menu_Item *item)
+{
+   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(item, NULL);
+   return WIDGET(item);
+}
+
 EAPI Elm_Menu_Item *
 elm_menu_first_item_get(const Evas_Object * obj)
 {