davemds pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=4059e2b5c3a93033e3926b2e4939206cfa504422
commit 4059e2b5c3a93033e3926b2e4939206cfa504422 Author: davemds <[email protected]> Date: Sat Aug 9 17:53:46 2014 +0200 Genlist: do not segv if the user clear the list on item double-click @fix moved the user callbacks call at the end of the function, so the user is able to modify the list without making the code below the call to fail miserably. Also improved the Genlist Del test to also include this case. --- src/bin/test_genlist.c | 32 +++++++++++++++++++++++++------- src/lib/elm_genlist.c | 23 ++++++++++++++--------- 2 files changed, 39 insertions(+), 16 deletions(-) diff --git a/src/bin/test_genlist.c b/src/bin/test_genlist.c index 0d80d1c..c6d65c7 100644 --- a/src/bin/test_genlist.c +++ b/src/bin/test_genlist.c @@ -3750,6 +3750,16 @@ _gl_del_unrealized_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, printf("unrealized item # %d\n", num); } +static void +_gl_del_doubleclick_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, + void *event_info) +{ + int num = (int)(uintptr_t)elm_object_item_data_get(event_info); + int num_category = num % 4; + + if (num_category == 3) + elm_genlist_clear(obj); +} static Evas_Object * _gl_del_genlist_add(Evas_Object *bx) { @@ -3762,6 +3772,8 @@ _gl_del_genlist_add(Evas_Object *bx) evas_object_show(gl); evas_object_smart_callback_add(gl, "unrealized", _gl_del_unrealized_cb, NULL); + evas_object_smart_callback_add(gl, "clicked,double", + _gl_del_doubleclick_cb, NULL); return gl; } @@ -3786,15 +3798,20 @@ char *_gl_del_text_get(void *data, Evas_Object *obj EINA_UNUSED, { char buf[256] = { 0 }; int num = (int)(uintptr_t)data; - int num_category = num % 3; + int num_category = num % 4; if (num_category == 0) - snprintf(buf, sizeof(buf), "Item # %i - Item Del", num); + snprintf(buf, sizeof(buf), + "Item #%.02i - 1. Item Del", num); else if (num_category == 1) - snprintf(buf, sizeof(buf), "Item # %i - Genlist Clear and Item Append", - num); + snprintf(buf, sizeof(buf), + "Item #%.02i - 2. Genlist Clear and Item Append", num); else if (num_category == 2) - snprintf(buf, sizeof(buf), "Item # %i - Genlist Del", num); + snprintf(buf, sizeof(buf), + "Item #%.02i - 3. Genlist Del", num); + else if (num_category == 3) + snprintf(buf, sizeof(buf), + "Item #%.02i - 4. Genlist Clear on double-click", num); return strdup(buf); } @@ -3803,7 +3820,7 @@ static void _gl_del_sel(void *data, Evas_Object *obj, void *event_info) { int num = (int)(uintptr_t)data; - int num_category = num % 3; + int num_category = num % 4; Elm_Object_Item *it = event_info; Elm_Genlist_Item_Class *itc = (Elm_Genlist_Item_Class *)elm_genlist_item_item_class_get(it); @@ -3856,7 +3873,8 @@ test_genlist_del(void *data EINA_UNUSED, " on item selection.<br/>" " 1. genlist item deletion<br/>" " 2. genlist clear and item append<br/>" - " 3. genlist del</align>"); + " 3. genlist del<br/>" + " 4. genlist clear on double-click</align>"); elm_object_content_set(fr, lb); evas_object_show(lb); diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c index 548cd46..0631279 100644 --- a/src/lib/elm_genlist.c +++ b/src/lib/elm_genlist.c @@ -3868,15 +3868,7 @@ _item_mouse_down_cb(void *data, else sd->on_hold = EINA_FALSE; if (sd->on_hold) return; sd->wasselected = it->selected; - it->highlight_cb(it); - if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK) - if ((!elm_widget_item_disabled_get(it)) && - (it->select_mode != ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY)) - { - evas_object_smart_callback_call(WIDGET(it), SIG_CLICKED_DOUBLE, it); - evas_object_smart_callback_call(WIDGET(it), SIG_ACTIVATED, it); - } - evas_object_smart_callback_call(WIDGET(it), SIG_PRESSED, it); + ecore_timer_del(it->item->swipe_timer); it->item->swipe_timer = ecore_timer_add(SWIPE_TIME, _swipe_cancel, it); ELM_SAFE_FREE(it->long_timer, ecore_timer_del); @@ -3887,6 +3879,19 @@ _item_mouse_down_cb(void *data, it->long_timer = NULL; sd->swipe = EINA_FALSE; sd->movements = 0; + + // and finally call the user callbacks. + // NOTE: keep this code at the bottom, as the user can change the + // list at this point (clear, delete, etc...) + it->highlight_cb(it); + if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK) + if ((!elm_widget_item_disabled_get(it)) && + (it->select_mode != ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY)) + { + evas_object_smart_callback_call(WIDGET(it), SIG_CLICKED_DOUBLE, it); + evas_object_smart_callback_call(WIDGET(it), SIG_ACTIVATED, it); + } + evas_object_smart_callback_call(WIDGET(it), SIG_PRESSED, it); } static Item_Block * --
