From b71266eff8288d3babe7ece5a9cef9e094c93bbf Mon Sep 17 00:00:00 2001 From: Hyoyoung Chang Date: Tue, 7 Sep 2010 19:47:15 +0900 Subject: [PATCH] [searchbar] adding base_bg event handler --- src/lib/elm_searchbar.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/src/lib/elm_searchbar.c b/src/lib/elm_searchbar.c index d80bcba..e7232ec 100644 --- a/src/lib/elm_searchbar.c +++ b/src/lib/elm_searchbar.c @@ -65,13 +65,6 @@ static void _sizing_eval(Evas_Object *obj) evas_object_size_hint_max_set(obj, maxw, maxh); } -static void -_searchicon_clicked(void *data, Evas_Object *obj, const char *emission, const char *source) -{ - if (!strcmp(source, "search_icon")) - evas_object_smart_callback_call(data, "searchsymbol,clicked", NULL); -} - static void _clicked(void *data, Evas_Object *obj, const char *emission, const char *source) { Widget_Data *wd = elm_widget_data_get(data); @@ -114,6 +107,18 @@ static void _cancel_clicked(void *data, Evas_Object *obj, const char *emission, evas_object_smart_callback_call(data, "cancel,clicked", NULL); } +static void +_searchicon_clicked(void *data, Evas_Object *obj, const char *emission, const char *source) +{ + Widget_Data *wd = elm_widget_data_get(data); + if (!wd) return; + + if (!strcmp(source, "search_icon")) + evas_object_smart_callback_call(data, "searchsymbol,clicked", NULL); + else if (!strcmp(source, "base_bg")) + _clicked(data, obj, emission, source); +} + /** * Add a new searchbar to the parent * @param parent The parent object @@ -156,7 +161,7 @@ EAPI Evas_Object *elm_searchbar_add(Evas_Object *parent) elm_editfield_eraser_set(wd->eb, EINA_TRUE); evas_object_smart_callback_add(wd->eb, "clicked", _clicked, obj); evas_object_smart_callback_add(elm_editfield_entry_get(wd->eb), "changed", _changed, obj); - edje_object_signal_callback_add(wd->base, "mouse,up,1", "search_icon", _searchicon_clicked, obj); + edje_object_signal_callback_add(wd->base, "mouse,up,1", "*", _searchicon_clicked, obj); elm_widget_sub_object_add(obj, wd->eb); -- 2.7.4