From d362b574ab32ae9ca5e64231f9d32dc9a2c8b351 Mon Sep 17 00:00:00 2001 From: ChunEon Park Date: Wed, 20 Nov 2013 10:56:31 +0900 Subject: [PATCH] elementary/ctxpopup - fix T235 ctxpopup_example_01 can popup many times at once. I know this is not fundamental fix but there is no solution at this moment unless fixing the evas. --- legacy/elementary/src/bin/test_ctxpopup.c | 42 +++++++++++++++++-- .../src/examples/ctxpopup_example_01.c | 29 +++++++++++++ 2 files changed, 68 insertions(+), 3 deletions(-) diff --git a/legacy/elementary/src/bin/test_ctxpopup.c b/legacy/elementary/src/bin/test_ctxpopup.c index f5164697c0..03e394b086 100644 --- a/legacy/elementary/src/bin/test_ctxpopup.c +++ b/legacy/elementary/src/bin/test_ctxpopup.c @@ -3,7 +3,7 @@ #endif #include - +static int list_mouse_down = 0; static void _dismissed(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) @@ -95,7 +95,6 @@ _ctxpopup_item_new(Evas_Object *obj, const char *label, const char *icon) return it; } - static void _list_item_cb(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) { @@ -103,6 +102,8 @@ _list_item_cb(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UN Elm_Object_Item *it = NULL; Evas_Coord x,y; + if (list_mouse_down > 0) return; + ctxpopup = elm_ctxpopup_add(obj); evas_object_smart_callback_add(ctxpopup, "dismissed", _dismissed, NULL); @@ -129,6 +130,8 @@ _list_item_cb2(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_U Elm_Object_Item *it = NULL; Evas_Coord x,y; + if (list_mouse_down > 0) return; + ctxpopup = elm_ctxpopup_add(obj); evas_object_smart_callback_add(ctxpopup, "dismissed", _dismissed, NULL); @@ -154,6 +157,8 @@ _list_item_cb3(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_U Elm_Object_Item *it = NULL; Evas_Coord x,y; + if (list_mouse_down > 0) return; + ctxpopup = elm_ctxpopup_add(obj); evas_object_smart_callback_add(ctxpopup, "dismissed", _dismissed, NULL); @@ -177,6 +182,8 @@ _list_item_cb4(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_U Evas_Object *ctxpopup; Evas_Coord x,y; + if (list_mouse_down > 0) return; + ctxpopup = elm_ctxpopup_add(obj); evas_object_smart_callback_add(ctxpopup, "dismissed", _dismissed, NULL); @@ -203,6 +210,8 @@ _list_item_cb5(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_U Evas_Object *ctxpopup, *btn, *sc, *bx; Evas_Coord x,y; + if (list_mouse_down > 0) return; + bx = elm_box_add(obj); evas_object_size_hint_min_set(bx, 150, 150); @@ -240,6 +249,8 @@ _list_item_cb6(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_U Evas_Object *ctxpopup, *btn, *sc, *bx; Evas_Coord x,y; + if (list_mouse_down > 0) return; + bx = elm_box_add(obj); evas_object_size_hint_min_set(bx, 200, 150); @@ -295,6 +306,7 @@ _list_item_cb7(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_U Evas_Object *ctxpopup; Evas_Coord x,y; + if (list_mouse_down > 0) return; ctxpopup = elm_ctxpopup_add(obj); evas_object_smart_callback_add(ctxpopup, "dismissed", _dismissed, NULL); @@ -309,20 +321,44 @@ _list_item_cb7(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_U _print_current_dir(ctxpopup); } -static void _list_clicked(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) +static void +_list_clicked(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { elm_list_item_selected_set(event_info, EINA_FALSE); } +static void +_list_mouse_down(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +{ + list_mouse_down++; +} + +static void +_list_mouse_up(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +{ + list_mouse_down--; +} + +static void +_win_del(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +{ + list_mouse_down = 0; +} + void test_ctxpopup(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { Evas_Object *win, *list; win = elm_win_util_standard_add("contextual-popup", "Contextual Popup"); + evas_object_smart_callback_add(win, "delete,request", _win_del, NULL); elm_win_autodel_set(win, EINA_TRUE); list = elm_list_add(win); + evas_object_event_callback_add(list, EVAS_CALLBACK_MOUSE_DOWN, + _list_mouse_down, NULL); + evas_object_event_callback_add(list, EVAS_CALLBACK_MOUSE_UP, + _list_mouse_up, NULL); evas_object_size_hint_weight_set(list, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, list); elm_list_mode_set(list, ELM_LIST_COMPRESS); diff --git a/legacy/elementary/src/examples/ctxpopup_example_01.c b/legacy/elementary/src/examples/ctxpopup_example_01.c index 9b998ace4c..c0cf1643e2 100644 --- a/legacy/elementary/src/examples/ctxpopup_example_01.c +++ b/legacy/elementary/src/examples/ctxpopup_example_01.c @@ -3,6 +3,8 @@ #include +static int list_mouse_down = 0; + static void _dismissed_cb(void *data, Evas_Object *obj, void *event_info) { @@ -30,6 +32,8 @@ _list_item_cb(void *data, Evas_Object *obj, void *event_info) Elm_Object_Item *it; Evas_Coord x,y; + if (list_mouse_down > 0) return; + ctxpopup = elm_ctxpopup_add(obj); evas_object_smart_callback_add(ctxpopup, "dismissed", _dismissed_cb, NULL); @@ -56,6 +60,8 @@ _list_item_cb2(void *data, Evas_Object *obj, void *event_info) Elm_Object_Item *it; Evas_Coord x,y; + if (list_mouse_down > 0) return; + ctxpopup = elm_ctxpopup_add(obj); evas_object_smart_callback_add(ctxpopup, "dismissed", _dismissed_cb, NULL); elm_ctxpopup_horizontal_set(ctxpopup, EINA_TRUE); @@ -75,6 +81,24 @@ _list_item_cb2(void *data, Evas_Object *obj, void *event_info) elm_list_item_selected_set(event_info, EINA_FALSE); } +static void +_list_mouse_down(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +{ + list_mouse_down++; +} + +static void +_list_mouse_up(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +{ + list_mouse_down--; +} + +static void +_win_del(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +{ + list_mouse_down = 0; +} + EAPI_MAIN int elm_main(int argc, char **argv) { @@ -83,11 +107,16 @@ elm_main(int argc, char **argv) elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED); win = elm_win_util_standard_add("Contextual Popup", "Contextual Popup"); + evas_object_smart_callback_add(win, "delete,request", _win_del, NULL); elm_win_autodel_set(win, EINA_TRUE); evas_object_resize(win, 400, 400); evas_object_show(win); list = elm_list_add(win); + evas_object_event_callback_add(list, EVAS_CALLBACK_MOUSE_DOWN, + _list_mouse_down, NULL); + evas_object_event_callback_add(list, EVAS_CALLBACK_MOUSE_UP, + _list_mouse_up, NULL); evas_object_size_hint_weight_set(list, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, list); elm_list_mode_set(list, ELM_LIST_COMPRESS);