timer23
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Combobox: rename the "selected" event to "item,selected" as it should be. 

Also updated the test to reflect this change
This commit is contained in:
Davide Andreoli 2016-01-19 20:33:47 +01:00
parent dc22117232
commit 026196fe1f
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
legacy/elementary/src/bin/test_combobox.c
View File

@ -12,11 +12,11 @@ _combobox_clicked_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
}
static void
_combobox_selected_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
void *event_info)
_combobox_item_selected_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
void *event_info)
{
const char *txt = elm_object_item_text_get(event_info);
printf("'selected' callback is called. (selected item : %s)\n", txt);
printf("'item,selected' callback is called. (selected item : %s)\n", txt);
}
static void
@ -125,12 +125,12 @@ test_combobox(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
(void*)(uintptr_t)(i * 10));
evas_object_smart_callback_add(combobox, "clicked",
_combobox_clicked_cb, NULL);
evas_object_smart_callback_add(combobox, "selected",
_combobox_selected_cb, NULL);
evas_object_smart_callback_add(combobox, "dismissed",
_combobox_dismissed_cb, NULL);
evas_object_smart_callback_add(combobox, "expanded",
_combobox_expanded_cb, NULL);
evas_object_smart_callback_add(combobox, "item,selected",
_combobox_item_selected_cb, NULL);
evas_object_smart_callback_add(combobox, "item,pressed",
_combobox_item_pressed_cb, NULL);
evas_object_smart_callback_add(combobox, "filter,done",
@ -148,8 +148,10 @@ test_combobox(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
(void*)(uintptr_t)(i * 10));
evas_object_smart_callback_add(combobox, "clicked",
_combobox_clicked_cb, NULL);
evas_object_smart_callback_add(combobox, "selected",
_combobox_selected_cb, NULL);
evas_object_smart_callback_add(combobox, "item,selected",
_combobox_item_selected_cb, NULL);
evas_object_smart_callback_add(combobox, "item,pressed",
_combobox_item_pressed_cb, NULL);
evas_object_smart_callback_add(combobox, "dismissed",
_combobox_dismissed_cb, NULL);
evas_object_smart_callback_add(combobox, "expanded",

6
legacy/elementary/src/lib/elc_combobox.c
View File

@ -15,16 +15,16 @@
#define MY_CLASS_NAME "Elm_Combobox"
#define MY_CLASS_NAME_LEGACY "elm_combobox"
static const char SIG_SELECTED[] = "selected";
static const char SIG_DISMISSED[] = "dismissed";
static const char SIG_EXPANDED[] = "expanded";
static const char SIG_ITEM_SELECTED[] = "item,selected";
static const char SIG_ITEM_PRESSED[] = "item,pressed";
static const char SIG_FILTER_DONE[] = "filter,done";
static const Evas_Smart_Cb_Description _smart_callbacks[] = {
{SIG_SELECTED, ""},
{SIG_DISMISSED, ""},
{SIG_EXPANDED, ""},
{SIG_ITEM_SELECTED, ""},
{SIG_ITEM_PRESSED, ""},
{SIG_FILTER_DONE, ""},
{"clicked", ""}, /**< handled by parent button class */
@ -165,7 +165,7 @@ _on_item_selected(void *data , Evas_Object *obj EINA_UNUSED, void *event)
{
ELM_COMBOBOX_DATA_GET(data, sd);
elm_object_focus_set(sd->entry, EINA_TRUE);
eo_do(data, eo_event_callback_call(ELM_COMBOBOX_EVENT_SELECTED, event));
eo_do(data, eo_event_callback_call(ELM_COMBOBOX_EVENT_ITEM_SELECTED, event));
}
static void

2
legacy/elementary/src/lib/elm_combobox.eo
View File

@ -48,10 +48,10 @@ class Elm_Combobox (Elm.Button, Evas.Selectable_Interface,
Elm_Interface_Atspi_Widget_Action.elm_actions.get;
}
events {
selected;
dismissed;
expanded;
clicked;
item,selected;
item,pressed;
filter,done;
}