elementary/genlsit, gengrid - removed duplicated disabled field.

deprecated elm_genlist_item_disabled_set/get,
please use elm_object_item_disabled_set/get instead.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@67562 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/bin/test_genlist.c b/src/bin/test_genlist.c
index e5f501e..a10c361 100644 (file)
--- a/src/bin/test_genlist.c
+++ b/src/bin/test_genlist.c
@@ -286,8 +286,8 @@ my_gl_disable(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED
         printf("no item selected\n");
         return;
      }
-   elm_genlist_item_disabled_set(gli, 1);
-   elm_genlist_item_selected_set(gli, 0);
+   elm_object_item_disabled_set(gli, EINA_TRUE);
+   elm_genlist_item_selected_set(gli, EINA_FALSE);
    elm_genlist_item_update(gli);
 }
 

diff --git a/src/examples/genlist_example_04.c b/src/examples/genlist_example_04.c
index 5132f71..c4d11ca 100644 (file)
--- a/src/examples/genlist_example_04.c
+++ b/src/examples/genlist_example_04.c
@@ -327,7 +327,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__)
        switch (i)
          {
           case 3:
-             elm_genlist_item_disabled_set(gli, EINA_TRUE);
+              elm_object_item_disabled_set(gli, EINA_TRUE);
              break;
           case 50:
              evas_object_smart_callback_add(

diff --git a/src/lib/elm_deprecated.h b/src/lib/elm_deprecated.h
index 07e9682..9f0acf6 100644 (file)
--- a/src/lib/elm_deprecated.h
+++ b/src/lib/elm_deprecated.h
@@ -1776,6 +1776,37 @@ EINA_DEPRECATED EAPI void                         *elm_genlist_item_data_get(con
  */
 EINA_DEPRECATED EAPI void                          elm_genlist_item_data_set(Elm_Object_Item *it, const void *data);
 
+/**
+ * Set whether a given genlist item is disabled or not.
+ *
+ * @param it The item
+ * @param disabled Use @c EINA_TRUE, true disable it, @c EINA_FALSE
+ * to enable it back.
+ *
+ * A disabled item cannot be selected or unselected. It will also
+ * change its appearance, to signal the user it's disabled.
+ *
+ * @see elm_genlist_item_disabled_get()
+ * @deprecated Use elm_object_item_disabled_set() instead
+ *
+ * @ingroup Genlist
+ */
+EINA_DEPRECATED EAPI void                          elm_genlist_item_disabled_set(Elm_Object_Item *it, Eina_Bool disabled);
+
+/**
+ * Get whether a given genlist item is disabled or not.
+ *
+ * @param it The item
+ * @return @c EINA_TRUE, if it's disabled, @c EINA_FALSE otherwise
+ * (and on errors).
+ *
+ * @see elm_genlist_item_disabled_set() for more details
+ * @deprecated Use elm_object_item_disabled_get() instead
+ *
+ * @ingroup Genlist
+ */
+EINA_DEPRECATED EAPI Eina_Bool                     elm_genlist_item_disabled_get(const Elm_Object_Item *it);
+
 #define ELM_IMAGE_ROTATE_90_CW 1
 #define ELM_IMAGE_ROTATE_180_CW 2
 #define ELM_IMAGE_ROTATE_90_CCW 3

diff --git a/src/lib/elm_gen_common.h b/src/lib/elm_gen_common.h
index e67a07a..4129825 100644 (file)
--- a/src/lib/elm_gen_common.h
+++ b/src/lib/elm_gen_common.h
@@ -66,7 +66,6 @@ struct Elm_Gen_Item
    Eina_Bool                 realized : 1;
    Eina_Bool                 selected : 1;
    Eina_Bool                 highlighted : 1;
-   Eina_Bool                 disabled : 1;
    Eina_Bool                 dragging : 1;
    Eina_Bool                 down : 1;
    Eina_Bool                 group : 1;

diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c
index 66a8dbf..946bcf2 100644 (file)
--- a/src/lib/elm_gengrid.c
+++ b/src/lib/elm_gengrid.c
@@ -766,7 +766,8 @@ _long_press(void *data)
    Elm_Gen_Item *it = data;
 
    it->long_timer = NULL;
-   if ((it->disabled) || (it->dragging)) return ECORE_CALLBACK_CANCEL;
+   if (elm_widget_item_disabled_get(it)|| (it->dragging))
+     return ECORE_CALLBACK_CANCEL;
    it->wd->longpressed = EINA_TRUE;
    evas_object_smart_callback_call(WIDGET(it), SIG_LONGPRESSED, it);
    if (it->wd->reorder_mode)
@@ -870,7 +871,7 @@ _mouse_up(void            *data,
         if (it->want_unrealize)
           _elm_genlist_item_unrealize(it, EINA_FALSE);
      }
-   if ((it->disabled) || (dragged)) return;
+   if (elm_widget_item_disabled_get(it) || (dragged)) return;
    if (it->wd->multi)
      {
         if (!it->selected)
@@ -1029,7 +1030,7 @@ _item_realize(Elm_Gen_Item *it)
 
         if (it->selected)
           edje_object_signal_emit(VIEW(it), "elm,state,selected", "elm");
-        if (it->disabled)
+        if (elm_widget_item_disabled_get(it))
           edje_object_signal_emit(VIEW(it), "elm,state,disabled", "elm");
      }
    evas_object_show(VIEW(it));
@@ -2345,12 +2346,12 @@ elm_gengrid_item_disabled_set(Elm_Gen_Item *it,
                               Eina_Bool         disabled)
 {
    ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
-   if (it->disabled == disabled) return;
+   if (it->base.disabled == disabled) return;
    if (it->generation < it->wd->generation) return;
-   it->disabled = !!disabled;
+   it->base.disabled = !!disabled;
    if (it->realized)
      {
-        if (it->disabled)
+        if (elm_widget_item_disabled_get(it))
           edje_object_signal_emit(VIEW(it), "elm,state,disabled", "elm");
         else
           edje_object_signal_emit(VIEW(it), "elm,state,enabled", "elm");
@@ -2362,7 +2363,7 @@ elm_gengrid_item_disabled_get(const Elm_Gen_Item *it)
 {
    ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, EINA_FALSE);
    if (it->generation < it->wd->generation) return EINA_FALSE;
-   return it->disabled;
+   return elm_widget_item_disabled_get(it);
 }
 
 static Evas_Object *

diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index 94e8ae3..1c2fe13 100644 (file)
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -649,8 +649,9 @@ static void
 _item_highlight(Elm_Gen_Item *it)
 {
    const char *selectraise;
-   if ((it->wd->no_select) || (it->generation < it->wd->generation) || (it->highlighted) ||
-       (it->disabled) || (it->display_only) || (it->item->mode_view))
+   if ((it->wd->no_select) || (it->generation < it->wd->generation) ||
+       (it->highlighted) || elm_widget_item_disabled_get(it) ||
+       (it->display_only) || (it->item->mode_view))
      return;
    edje_object_signal_emit(VIEW(it), "elm,state,selected", "elm");
    selectraise = edje_object_data_get(VIEW(it), "selectraise");
@@ -985,7 +986,7 @@ _long_press(void *data)
    Eina_List *list, *l;
 
    it->long_timer = NULL;
-   if ((it->disabled) || (it->dragging) || (it->display_only))
+   if (elm_widget_item_disabled_get(it) || (it->dragging) || (it->display_only))
      return ECORE_CALLBACK_CANCEL;
    it->wd->longpressed = EINA_TRUE;
    evas_object_smart_callback_call(WIDGET(it), SIG_LONGPRESSED, it);
@@ -1019,7 +1020,7 @@ _swipe(Elm_Gen_Item *it)
    int i, sum = 0;
 
    if (!it) return;
-   if ((it->display_only) || (it->disabled)) return;
+   if ((it->display_only) || elm_widget_item_disabled_get(it)) return;
    it->wd->swipe = EINA_FALSE;
    for (i = 0; i < it->wd->movements; i++)
      {
@@ -1227,7 +1228,7 @@ _mouse_down(void        *data,
    it->wd->wasselected = it->selected;
    _item_highlight(it);
    if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
-     if ((!it->disabled) && (!it->display_only))
+     if ((!elm_widget_item_disabled_get(it)) && (!it->display_only))
        {
           evas_object_smart_callback_call(WIDGET(it), SIG_CLICKED_DOUBLE, it);
           evas_object_smart_callback_call(WIDGET(it), SIG_ACTIVATED, it);
@@ -1336,7 +1337,8 @@ _mouse_up(void        *data,
                _item_block_unrealize(it->item->block);
           }
      }
-   if ((it->disabled) || (dragged) || (it->display_only)) return;
+   if (elm_widget_item_disabled_get(it) || (dragged) || (it->display_only))
+     return;
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
    if (it->wd->multi)
      {
@@ -1517,7 +1519,7 @@ _item_cache_add(Elm_Gen_Item *it)
    if (it->item->flags & ELM_GENLIST_ITEM_SUBITEMS) itc->tree = 1;
    itc->compress = (it->wd->compress);
    itc->selected = it->selected;
-   itc->disabled = it->disabled;
+   itc->disabled = elm_widget_item_disabled_get(it);
    itc->expanded = it->item->expanded;
    if (it->long_timer)
      {
@@ -1617,9 +1619,9 @@ _elm_genlist_item_state_update(Elm_Gen_Item *it, Item_Cache *itc)
                edje_object_signal_emit(VIEW(it),
                                        "elm,state,selected", "elm");
           }
-        if (it->disabled != itc->disabled)
+        if (elm_widget_item_disabled_get(it) != itc->disabled)
           {
-             if (it->disabled)
+             if (elm_widget_item_disabled_get(it))
                edje_object_signal_emit(VIEW(it),
                                        "elm,state,disabled", "elm");
           }
@@ -1635,7 +1637,7 @@ _elm_genlist_item_state_update(Elm_Gen_Item *it, Item_Cache *itc)
         if (it->selected)
           edje_object_signal_emit(VIEW(it),
                                   "elm,state,selected", "elm");
-        if (it->disabled)
+        if (elm_widget_item_disabled_get(it))
           edje_object_signal_emit(VIEW(it),
                                   "elm,state,disabled", "elm");
         if (it->item->expanded)
@@ -1751,7 +1753,7 @@ _item_content_realize(Elm_Gen_Item *it,
                   edje_object_part_swallow(target, key, ic);
                   evas_object_show(ic);
                   elm_widget_sub_object_add(WIDGET(it), ic);
-                  if (it->disabled)
+                  if (elm_widget_item_disabled_get(it))
                     elm_widget_disabled_set(ic, EINA_TRUE);
                }
           }
@@ -3237,6 +3239,30 @@ _item_text_hook(Elm_Gen_Item *it, const char *part)
    return edje_object_part_text_get(VIEW(it), part);
 }
 
+static void
+_item_disable_hook(Elm_Object_Item *it)
+{
+   ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
+   Eina_List *l;
+   Evas_Object *obj;
+   Elm_Gen_Item *_it = (Elm_Gen_Item *) it;
+
+   if (_it->generation < _it->wd->generation) return;
+
+   if (_it->selected)
+     elm_genlist_item_selected_set(it, EINA_FALSE);
+
+   if (_it->realized)
+     {
+        if (elm_widget_item_disabled_get(it))
+          edje_object_signal_emit(VIEW(_it), "elm,state,disabled", "elm");
+        else
+          edje_object_signal_emit(VIEW(_it), "elm,state,enabled", "elm");
+        EINA_LIST_FOREACH(_it->content_objs, l, obj)
+          elm_widget_disabled_set(obj, elm_widget_item_disabled_get(_it));
+     }
+}
+
 Elm_Gen_Item *
 _elm_genlist_item_new(Widget_Data              *wd,
                       const Elm_Gen_Item_Class *itc,
@@ -3259,6 +3285,7 @@ _elm_genlist_item_new(Widget_Data              *wd,
    elm_widget_item_content_get_hook_set(it, _item_content_get_hook);
    elm_widget_item_content_set_hook_set(it, _item_content_set_hook);
    elm_widget_item_content_unset_hook_set(it, _item_content_unset_hook);
+   elm_widget_item_disable_hook_set(it, _item_disable_hook);
    /* TEMPORARY */
    it->sel_cb = (Ecore_Cb)_item_select;
 
@@ -4279,7 +4306,8 @@ elm_genlist_item_selected_set(Elm_Object_Item *it,
    Elm_Gen_Item *_it = (Elm_Gen_Item *) it;
    Widget_Data *wd = _it->wd;
    if (!wd) return;
-   if ((_it->generation < wd->generation) || (_it->disabled)) return;
+   if ((_it->generation < wd->generation) || elm_widget_item_disabled_get(_it))
+     return;
    selected = !!selected;
    if (_it->selected == selected) return;
 
@@ -4351,33 +4379,13 @@ EAPI void
 elm_genlist_item_disabled_set(Elm_Object_Item  *it,
                               Eina_Bool         disabled)
 {
-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
-   Eina_List *l;
-   Evas_Object *obj;
-   Elm_Gen_Item *_it = (Elm_Gen_Item *) it;
-   if (_it->disabled == disabled) return;
-   if (_it->generation < _it->wd->generation) return;
-   _it->disabled = !!disabled;
-   if (_it->selected)
-     elm_genlist_item_selected_set(it, EINA_FALSE);
-   if (_it->realized)
-     {
-        if (_it->disabled)
-          edje_object_signal_emit(VIEW(_it), "elm,state,disabled", "elm");
-        else
-          edje_object_signal_emit(VIEW(_it), "elm,state,enabled", "elm");
-        EINA_LIST_FOREACH(_it->content_objs, l, obj)
-          elm_widget_disabled_set(obj, disabled);
-     }
+   elm_object_item_disabled_set(it, disabled);
 }
 
 EAPI Eina_Bool
 elm_genlist_item_disabled_get(const Elm_Object_Item *it)
 {
-   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, EINA_FALSE);
-   Elm_Gen_Item *_it = (Elm_Gen_Item *) it;
-   if (_it->generation < _it->wd->generation) return EINA_FALSE;
-   return _it->disabled;
+   return elm_object_item_disabled_get(it);
 }
 
 EAPI void
@@ -5196,7 +5204,8 @@ elm_genlist_item_mode_set(Elm_Object_Item  *it,
 
    if (!wd) return;
    if (!mode_type) return;
-   if ((_it->generation < _it->wd->generation) || (_it->disabled)) return;
+   if ((_it->generation < _it->wd->generation) ||
+       elm_widget_item_disabled_get(_it)) return;
 
    if ((wd->mode_item == _it) &&
        (!strcmp(mode_type, wd->mode_type)) &&

diff --git a/src/lib/elm_genlist.h b/src/lib/elm_genlist.h
index f5be3c8..d153457 100644 (file)
--- a/src/lib/elm_genlist.h
+++ b/src/lib/elm_genlist.h
@@ -173,8 +173,8 @@
  * to expand/contract an item and get its expanded state, use
  * elm_genlist_item_expanded_set() and elm_genlist_item_expanded_get(). And
  * again to make an item disabled (unable to be selected and appear
- * differently) use elm_genlist_item_disabled_set() to set this and
- * elm_genlist_item_disabled_get() to get the disabled state.
+ * differently) use elm_object_item_disabled_set() to set this and
+ * elm_object_item_disabled_get() to get the disabled state.
  *
  * In general to indicate how the genlist should expand items horizontally to
  * fill the list area, use elm_genlist_horizontal_set(). Valid modes are
@@ -1201,34 +1201,6 @@ EAPI Eina_Bool                     elm_genlist_item_expanded_get(const Elm_Objec
  */
 EAPI int                           elm_genlist_item_expanded_depth_get(const Elm_Object_Item *it);
 
-/**
- * Set whether a given genlist item is disabled or not.
- *
- * @param it The item
- * @param disabled Use @c EINA_TRUE, true disable it, @c EINA_FALSE
- * to enable it back.
- *
- * A disabled item cannot be selected or unselected. It will also
- * change its appearance, to signal the user it's disabled.
- *
- * @see elm_genlist_item_disabled_get()
- *
- * @ingroup Genlist
- */
-EAPI void                          elm_genlist_item_disabled_set(Elm_Object_Item *it, Eina_Bool disabled);
-
-/**
- * Get whether a given genlist item is disabled or not.
- *
- * @param it The item
- * @return @c EINA_TRUE, if it's disabled, @c EINA_FALSE otherwise
- * (and on errors).
- *
- * @see elm_genlist_item_disabled_set() for more details
- *
- * @ingroup Genlist
- */
-EAPI Eina_Bool                     elm_genlist_item_disabled_get(const Elm_Object_Item *it);
 
 /**
  * Sets the display only state of an item.