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

efl_ui: rename select and unselected of efl_ui_selectable 

Summary:
this was conflicting with a model event. Prefixing it with "item,"
resolves this, and describes better what it does.
Depends on D8413

Reviewers: zmike

Reviewed By: zmike

Subscribers: cedric, #reviewers, #committers

Tags: #efl

Differential Revision: https://phab.enlightenment.org/D8414
This commit is contained in:
Marcel Hollerbach 2019-03-19 16:30:19 -04:00 committed by Mike Blumenkrantz
parent 9a3d4310be
commit 11003bcae3
10 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/examples/elementary/efl_ui_list_example_1.c
View File

@ -125,8 +125,8 @@ elm_main(int argc EINA_UNUSED, char **argv)
priv_d.list = list = efl_add(EFL_UI_LIST_CLASS, wbox);
efl_gfx_hint_weight_set(list, EFL_GFX_HINT_EXPAND, 0.9);
efl_event_callback_add(list, EFL_UI_EVENT_SELECTED, _list_selected, NULL);
efl_event_callback_add(list, EFL_UI_EVENT_UNSELECTED, _list_unselected, NULL);
efl_event_callback_add(list, EFL_UI_EVENT_ITEM_SELECTED, _list_selected, NULL);
efl_event_callback_add(list, EFL_UI_EVENT_ITEM_UNSELECTED, _list_unselected, NULL);
efl_event_callback_add(list, EFL_UI_EVENT_PRESSED, _list_pressed, NULL);
efl_event_callback_add(list, EFL_UI_EVENT_UNPRESSED, _list_unpressed, NULL);
efl_event_callback_add(list, EFL_UI_EVENT_LONGPRESSED, _list_longpressed, NULL);

4
src/lib/efl/interfaces/efl_ui_selectable.eo
View File

@ -4,9 +4,9 @@ interface @beta Efl.Ui.Selectable
event_prefix: efl_ui;
events {
/* FIXME: Called with multiple types of event_info! */
selected: void; [[Called when selected]]
item,selected: Efl.Object; [[Called when selected]]
/* FIXME: Called with multiple types of event_info! */
unselected: void; [[Called when no longer selected]]
item,unselected: Efl.Object; [[Called when no longer selected]]
selection,paste: void; [[Called when selection is pasted]]
selection,copy: void; [[Called when selection is copied]]
selection,cut: void; [[Called when selection is cut]]

12
src/lib/elementary/efl_ui_grid.c
View File

@ -903,7 +903,7 @@ _grid_item_selected(void *data, const Efl_Event *event)
pd->selected = eina_list_append(pd->selected, item);
pd->last_selected = item;
efl_event_callback_call(obj, EFL_UI_EVENT_SELECTED, item);
efl_event_callback_call(obj, EFL_UI_EVENT_ITEM_SELECTED, item);
}
static void
@ -916,7 +916,7 @@ _grid_item_unselected(void *data, const Efl_Event *event)
pd->selected = eina_list_remove(pd->selected, item);
if (pd->last_selected == item) pd->last_selected = NULL;
efl_event_callback_call(obj, EFL_UI_EVENT_UNSELECTED, item);
efl_event_callback_call(obj, EFL_UI_EVENT_ITEM_UNSELECTED, item);
}
static void
@ -945,8 +945,8 @@ _grid_item_process(Eo *obj, Efl_Ui_Grid_Data *pd, EINA_UNUSED Efl_Ui_Grid_Item *
efl_event_callback_add(it, EFL_UI_EVENT_PRESSED, _grid_item_pressed, obj);
efl_event_callback_add(it, EFL_UI_EVENT_UNPRESSED, _grid_item_unpressed, obj);
efl_event_callback_add(it, EFL_UI_EVENT_LONGPRESSED, _grid_item_longpressed, obj);
efl_event_callback_add(it, EFL_UI_EVENT_SELECTED, _grid_item_selected, obj);
efl_event_callback_add(it, EFL_UI_EVENT_UNSELECTED, _grid_item_unselected, obj);
efl_event_callback_add(it, EFL_UI_EVENT_ITEM_SELECTED, _grid_item_selected, obj);
efl_event_callback_add(it, EFL_UI_EVENT_ITEM_UNSELECTED, _grid_item_unselected, obj);
efl_event_callback_add(it, EFL_EVENT_DEL, _grid_item_deleted, obj);
return EINA_TRUE;
@ -971,8 +971,8 @@ _grid_item_unpack_internal(Eo *obj, Efl_Ui_Grid_Data *pd, Efl_Ui_Grid_Item *it)
efl_event_callback_del(it, EFL_UI_EVENT_PRESSED, _grid_item_pressed, obj);
efl_event_callback_del(it, EFL_UI_EVENT_UNPRESSED, _grid_item_unpressed, obj);
efl_event_callback_del(it, EFL_UI_EVENT_LONGPRESSED, _grid_item_longpressed, obj);
efl_event_callback_del(it, EFL_UI_EVENT_SELECTED, _grid_item_selected, obj);
efl_event_callback_del(it, EFL_UI_EVENT_UNSELECTED, _grid_item_unselected, obj);
efl_event_callback_del(it, EFL_UI_EVENT_ITEM_SELECTED, _grid_item_selected, obj);
efl_event_callback_del(it, EFL_UI_EVENT_ITEM_UNSELECTED, _grid_item_unselected, obj);
efl_event_callback_del(it, EFL_EVENT_DEL, _grid_item_deleted, obj);
}

4
src/lib/elementary/efl_ui_item.c
View File

@ -27,7 +27,7 @@ _item_select(Eo *obj, Efl_Ui_Item_Data *pd)
pd->selected = EINA_TRUE;
edje_object_signal_emit(wd->resize_obj, "efl,state,selected", "efl");
efl_event_callback_call(obj, EFL_UI_EVENT_SELECTED, NULL);
efl_event_callback_call(obj, EFL_UI_EVENT_ITEM_SELECTED, NULL);
}
static void
@ -38,7 +38,7 @@ _item_unselect(Eo *obj, Efl_Ui_Item_Data *pd)
pd->selected = EINA_FALSE;
edje_object_signal_emit(wd->resize_obj, "efl,state,unselected", "efl");
efl_event_callback_call(obj, EFL_UI_EVENT_UNSELECTED, NULL);
efl_event_callback_call(obj, EFL_UI_EVENT_ITEM_UNSELECTED, NULL);
}
/* Mouse Controls */

12
src/lib/elementary/efl_ui_list.c
View File

@ -657,7 +657,7 @@ _list_item_selected(void *data, const Efl_Event *event)
pd->selected = eina_list_append(pd->selected, item);
pd->last_selected = item;
efl_event_callback_call(obj, EFL_UI_EVENT_SELECTED, item);
efl_event_callback_call(obj, EFL_UI_EVENT_ITEM_SELECTED, item);
}
static void
@ -670,7 +670,7 @@ _list_item_unselected(void *data, const Efl_Event *event)
pd->selected = eina_list_remove(pd->selected, item);
if (pd->last_selected == item) pd->last_selected = NULL;
efl_event_callback_call(obj, EFL_UI_EVENT_UNSELECTED, item);
efl_event_callback_call(obj, EFL_UI_EVENT_ITEM_UNSELECTED, item);
}
static Eina_Bool
@ -689,8 +689,8 @@ _list_item_process(Eo *obj, Efl_Ui_List_Data *pd, EINA_UNUSED Efl_Ui_List_Item *
efl_event_callback_add(it, EFL_UI_EVENT_PRESSED, _list_item_pressed, obj);
efl_event_callback_add(it, EFL_UI_EVENT_UNPRESSED, _list_item_unpressed, obj);
efl_event_callback_add(it, EFL_UI_EVENT_LONGPRESSED, _list_item_longpressed, obj);
efl_event_callback_add(it, EFL_UI_EVENT_SELECTED, _list_item_selected, obj);
efl_event_callback_add(it, EFL_UI_EVENT_UNSELECTED, _list_item_unselected, obj);
efl_event_callback_add(it, EFL_UI_EVENT_ITEM_SELECTED, _list_item_selected, obj);
efl_event_callback_add(it, EFL_UI_EVENT_ITEM_UNSELECTED, _list_item_unselected, obj);
return EINA_TRUE;
}
@ -708,8 +708,8 @@ _list_item_clear(Eo *obj, Efl_Ui_List_Data *pd EINA_UNUSED, EINA_UNUSED Efl_Ui_L
efl_event_callback_del(it, EFL_UI_EVENT_PRESSED, _list_item_pressed, obj);
efl_event_callback_del(it, EFL_UI_EVENT_UNPRESSED, _list_item_unpressed, obj);
efl_event_callback_del(it, EFL_UI_EVENT_LONGPRESSED, _list_item_longpressed, obj);
efl_event_callback_del(it, EFL_UI_EVENT_SELECTED, _list_item_selected, obj);
efl_event_callback_del(it, EFL_UI_EVENT_UNSELECTED, _list_item_unselected, obj);
efl_event_callback_del(it, EFL_UI_EVENT_ITEM_SELECTED, _list_item_selected, obj);
efl_event_callback_del(it, EFL_UI_EVENT_ITEM_UNSELECTED, _list_item_unselected, obj);
}
/* Pack APIs */

2
src/lib/elementary/efl_ui_tab_bar.c
View File

@ -187,7 +187,7 @@ _tab_select(Efl_Ui_Tab_Bar_Data *sd, Tab_Info *ti)
index = eina_list_data_idx(sd->tab_infos, ti);
efl_event_callback_call(tp, EFL_UI_EVENT_SELECTED, (void *)(intptr_t)index);
efl_event_callback_call(tp, EFL_UI_EVENT_ITEM_SELECTED, (void *)(intptr_t)index);
sd->cur = index;
}

6
src/lib/elementary/efl_ui_tab_pager.c
View File

@ -60,7 +60,7 @@ _efl_ui_tab_pager_tab_bar_set(Eo *obj, Efl_Ui_Tab_Pager_Data *sd, Efl_Canvas_Obj
{
if (sd->tab_bar != NULL)
{
efl_event_callback_del(sd->tab_bar, EFL_UI_EVENT_SELECTED, _tab_select_cb, obj);
efl_event_callback_del(sd->tab_bar, EFL_UI_EVENT_ITEM_SELECTED, _tab_select_cb, obj);
efl_content_unset(efl_part(obj, "efl.tab_root"));
efl_del(sd->tab_bar);
}
@ -68,7 +68,7 @@ _efl_ui_tab_pager_tab_bar_set(Eo *obj, Efl_Ui_Tab_Pager_Data *sd, Efl_Canvas_Obj
sd->tab_bar = tab_bar;
efl_content_set(efl_part(obj, "efl.tab_root"), sd->tab_bar);
efl_event_callback_add(sd->tab_bar, EFL_UI_EVENT_SELECTED, _tab_select_cb, obj);
efl_event_callback_add(sd->tab_bar, EFL_UI_EVENT_ITEM_SELECTED, _tab_select_cb, obj);
}
EOLIAN static Efl_Canvas_Object *
@ -87,7 +87,7 @@ EOLIAN static void
_efl_ui_tab_pager_efl_object_destructor(Eo *obj, Efl_Ui_Tab_Pager_Data *sd)
{
if (sd->tab_bar != NULL)
efl_event_callback_del(sd->tab_bar, EFL_UI_EVENT_SELECTED, _tab_select_cb, obj);
efl_event_callback_del(sd->tab_bar, EFL_UI_EVENT_ITEM_SELECTED, _tab_select_cb, obj);
efl_destructor(efl_super(obj, MY_CLASS));
}

16
src/lib/elementary/elc_fileselector.c
View File

@ -1215,7 +1215,7 @@ _on_item_selected(void *data, const Efl_Event *event)
elm_object_text_set(sd->name_entry, it_data->filename);
_model_event_call
(data, EFL_UI_EVENT_SELECTED, it_data->model, it_data->path);
(data, EFL_UI_EVENT_ITEM_SELECTED, it_data->model, it_data->path);
}
else if (sd->multi && it_data->is_dir && sd->double_tap_navigation)
{
@ -1467,7 +1467,7 @@ _on_text_activated_set_path_then(void *data, const Eina_Value v, const Eina_Futu
selected:
if (sd->only_folder)
_model_event_call(fs, EFL_UI_EVENT_SELECTED, model, str);
_model_event_call(fs, EFL_UI_EVENT_ITEM_SELECTED, model, str);
end:
_text_activated_free_fs_data(fs);
@ -1607,9 +1607,9 @@ _files_list_add(Evas_Object *obj)
efl_ui_mirrored_automatic_set(li, EINA_FALSE);
efl_event_callback_add
(li, EFL_UI_EVENT_SELECTED, _on_item_selected, obj);
(li, EFL_UI_EVENT_ITEM_SELECTED, _on_item_selected, obj);
efl_event_callback_add
(li, EFL_UI_EVENT_UNSELECTED, _on_item_unselected, obj);
(li, EFL_UI_EVENT_ITEM_UNSELECTED, _on_item_unselected, obj);
efl_event_callback_add
(li, ELM_GENLIST_EVENT_ACTIVATED, _on_item_activated, obj);
efl_event_callback_add
@ -1644,9 +1644,9 @@ _files_grid_add(Evas_Object *obj)
elm_gengrid_align_set(grid, 0.0, 0.0);
efl_event_callback_add
(grid, EFL_UI_EVENT_SELECTED, _on_item_selected, obj);
(grid, EFL_UI_EVENT_ITEM_SELECTED, _on_item_selected, obj);
efl_event_callback_add
(grid, EFL_UI_EVENT_UNSELECTED, _on_item_unselected, obj);
(grid, EFL_UI_EVENT_ITEM_UNSELECTED, _on_item_unselected, obj);
efl_event_callback_add
(grid, ELM_GENGRID_EVENT_ACTIVATED, _on_item_activated, obj);
efl_event_callback_add
@ -1995,7 +1995,7 @@ _elm_fileselector_efl_object_event_callback_legacy_call(Eo *obj, Elm_Fileselecto
{
const Efl_Event_Description *evt_desc = NULL;
if (strcmp(desc->name, "selected") == 0)
evt_desc = EFL_UI_EVENT_SELECTED;
evt_desc = EFL_UI_EVENT_ITEM_SELECTED;
else if (strcmp(desc->name, "activated") == 0)
evt_desc = ELM_FILESELECTOR_EVENT_ACTIVATED;
else if (strcmp(desc->name, "directory,open") == 0)
@ -2010,7 +2010,7 @@ _elm_fileselector_efl_object_event_callback_legacy_call(Eo *obj, Elm_Fileselecto
return _from_legacy_event_call(obj, sd, desc, evt_desc, event_info);
}
if (desc == EFL_UI_EVENT_SELECTED ||
if (desc == EFL_UI_EVENT_ITEM_SELECTED ||
desc == ELM_FILESELECTOR_EVENT_ACTIVATED ||
desc == ELM_FILESELECTOR_EVENT_DIRECTORY_OPEN ||
desc == ELM_FILESELECTOR_EVENT_DONE ||

2
src/lib/elementary/elc_hoversel.c
View File

@ -176,7 +176,7 @@ _on_item_clicked(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED)
ELM_HOVERSEL_DATA_GET(obj2, sd);
if (item->func) item->func((void *)WIDGET_ITEM_DATA_GET(eo_it), obj2, eo_it);
efl_event_callback_legacy_call(obj2, EFL_UI_EVENT_SELECTED, eo_it);
efl_event_callback_legacy_call(obj2, EFL_UI_EVENT_ITEM_SELECTED, eo_it);
evas_object_event_callback_add(sd->hover, EVAS_CALLBACK_DEL, _auto_update, item);

2
src/lib/elementary/elm_color_class.c
View File

@ -743,7 +743,7 @@ elm_color_class_editor_add(Evas_Object *obj)
elm_genlist_mode_set(gl, ELM_LIST_COMPRESS);
elm_object_part_content_set(ly, "elm.swallow.list", gl);
efl_event_callback_add
(gl, EFL_UI_EVENT_SELECTED, _colorclass_activate, cc);
(gl, EFL_UI_EVENT_ITEM_SELECTED, _colorclass_activate, cc);
cc->reset = bt = elm_button_add(ly);
elm_object_style_set(bt, "colorclass");