Dear all,
Some applications want to know moved.after or before and relative item
because of updating their own list.
So I separated moved into moved.after and move.before.
Thanks,
Joey
Index: src/lib/elm_genlist.c
===================================================================
--- src/lib/elm_genlist.c (revision 69517)
+++ src/lib/elm_genlist.c (working copy)
@@ -210,7 +211,8 @@ static const char SIG_MULTI_SWIPE_DOWN[] = "multi,
static const char SIG_MULTI_PINCH_OUT[] = "multi,pinch,out";
static const char SIG_MULTI_PINCH_IN[] = "multi,pinch,in";
static const char SIG_SWIPE[] = "swipe";
-static const char SIG_MOVED[] = "moved";
+static const char SIG_MOVED_AFTER[] = "moved.after";
+static const char SIG_MOVED_BEFORE[] = "moved.before";
static const char SIG_INDEX_UPDATE[] = "index,update";
static const char SIG_TREE_EFFECT_FINISHED [] = "tree,effect,finished";
@@ -247,7 +249,8 @@ static const Evas_Smart_Cb_Description _signals[]
{SIG_MULTI_PINCH_OUT, ""},
{SIG_MULTI_PINCH_IN, ""},
{SIG_SWIPE, ""},
- {SIG_MOVED, ""},
+ {SIG_MOVED_AFTER, ""},
+ {SIG_MOVED_BEFORE, ""},
{SIG_TREE_EFFECT_FINISHED, ""},
{NULL, NULL}
};
@@ -4113,6 +4131,7 @@ _elm_genlist_item_list_compare(const void *data, c
return it->wd->item_compare_cb(it, item1);
}
+/*If application want to know the relative item, use elm_genlist_item_prev_get(it)*/
static void
_item_move_after(Elm_Gen_Item *it, Elm_Gen_Item *after)
{
@@ -4129,9 +4148,10 @@ _item_move_after(Elm_Gen_Item *it, Elm_Gen_Item *a
if (after->item->group_item) it->item->group_item = after->item->group_item;
_item_queue(it->wd, it, NULL);
- evas_object_smart_callback_call(WIDGET(it), SIG_MOVED, it);
+ evas_object_smart_callback_call(WIDGET(it), SIG_MOVED_AFTER, it);
}
+/*If application want to know the relative item, use elm_genlist_item_next_get(it)*/
static void
_item_move_before(Elm_Gen_Item *it, Elm_Gen_Item *before)
{
@@ -4147,7 +4167,7 @@ _item_move_before(Elm_Gen_Item *it, Elm_Gen_Item *
if (before->item->group_item) it->item->group_item = before->item->group_item;
_item_queue(it->wd, it, NULL);
- evas_object_smart_callback_call(WIDGET(it), SIG_MOVED, it);
+ evas_object_smart_callback_call(WIDGET(it), SIG_MOVED_BEFORE, it);
}
EAPI unsigned int
Index: src/lib/elm_genlist.h
===================================================================
--- src/lib/elm_genlist.h (revision 69517)
+++ src/lib/elm_genlist.h (working copy)
@@ -314,7 +314,8 @@
* pinched out. "- @c multi,pinch,in" - This is called when the genlist is
* multi-touch pinched in.
* - @c "swipe" - This is called when the genlist is swiped.
- * - @c "moved" - This is called when a genlist item is moved.
+ * - @c "moved.after" - This is called when a genlist item is moved after.
+ * - @c "moved.before" - This is called when a genlist item is moved before.
* - @c "language,changed" - This is called when the program's language is
* changed.
* - @c "tree,effect,finished" - This is called when a genlist tree effect is finished.
Index: src/bin/test_genlist.c
===================================================================
--- src/bin/test_genlist.c (revision 69517)
+++ src/bin/test_genlist.c (working copy)
@@ -1891,22 +1891,41 @@ _reorder_tg_changed_cb(void *data, Evas_Object *ob
}
/**
- * gl_moved is called after an item was reordered.
+ * gl_moved_after is called after an item was reordered.
* This is only called when reorder mode is enabled.
*
* @param data : the genlist object passed as data.
* @param obj : the genlist object.
* @param item : the moved item.
*
- * If the move_after is true,
* the item(*item) had been moved after the given relative item(*rel_item) in list.
- * If the move_after is false,
+ *
+ */
+static void gl_moved_after(Evas_Object *data __UNUSED__, Evas_Object *obj __UNUSED__, Elm_Object_Item *item __UNUSED__)
+{
+ // if needed, add application logic.
+ Elm_Object_Item *it;
+ it = elm_genlist_item_prev_get(item);
+ printf("it=%p, prev_it=%p\n",item,it);
+}
+
+/**
+ * gl_moved_before is called after an item was reordered.
+ * This is only called when reorder mode is enabled.
+ *
+ * @param data : the genlist object passed as data.
+ * @param obj : the genlist object.
+ * @param item : the moved item.
+ *
* the item(*item) had been moved before the given relative item(*rel_item) in list.
*
*/
-static void gl_moved(Evas_Object *data __UNUSED__, Evas_Object *obj __UNUSED__, Elm_Object_Item *item __UNUSED__)
+static void gl_moved_before(Evas_Object *data __UNUSED__, Evas_Object *obj __UNUSED__, Elm_Object_Item *item __UNUSED__)
{
// if needed, add application logic.
+ Elm_Object_Item *it;
+ it = elm_genlist_item_next_get(item);
+ printf("it=%p, next_it=%p\n",item,it);
}
void
@@ -1955,7 +1974,8 @@ test_genlist11(void *data __UNUSED__, Evas_Object
itc1->func.content_get = gl_content_get;
itc1->func.state_get = gl_state_get;
itc1->func.del = NULL;
- evas_object_smart_callback_add(gl, "moved", (Evas_Smart_Cb)gl_moved, gl);
+ evas_object_smart_callback_add(gl, "moved.after", (Evas_Smart_Cb)gl_moved_after, gl);
+ evas_object_smart_callback_add(gl, "moved.before", (Evas_Smart_Cb)gl_moved_before, gl);
for (i = 0; i < 50; i++)
elm_genlist_item_append(gl,
------------------------------------------------------------------------------
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here
http://p.sf.net/sfu/sfd2d-msazure
_______________________________________________
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
