enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

efl_ui_multi_selectable: remove all legacy usage from eo files 

this takes the current generated output from eolian for legacy code in
evas and adds it to the tree, then removes legacy references from the
corresponding eo files. in the case where the entire eo file was for
a legacy object, that eo file has been removed from the tree

ref T7724

Reviewed-by: Cedric BAIL <cedric.bail@free.fr>
Differential Revision: https://phab.enlightenment.org/D8120
This commit is contained in:
Mike Blumenkrantz 2019-03-05 17:00:37 -05:00 committed by Cedric BAIL
parent ef5853b6d5
commit 461c45df46
5 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -235,24 +235,24 @@ elm_main(int argc EINA_UNUSED, char **argv)
select_radio = radio = efl_add(EFL_UI_RADIO_CLASS, wbox);
efl_text_set(radio, "SINGLE");
efl_ui_radio_state_value_set(radio, EFL_UI_SELECT_SINGLE);
efl_ui_radio_state_value_set(radio, EFL_UI_SELECT_MODE_SINGLE);
efl_event_callback_add(radio, EFL_UI_RADIO_EVENT_CHANGED, _select_radio_changed, list);
efl_pack_end(bbox, radio);
radio = efl_add(EFL_UI_RADIO_CLASS, wbox);
efl_text_set(radio, "SINGLE_ALWAYS");
efl_ui_radio_state_value_set(radio, EFL_UI_SELECT_SINGLE_ALWAYS);
efl_ui_radio_state_value_set(radio, EFL_UI_SELECT_MODE_SINGLE_ALWAYS);
efl_ui_radio_group_add(radio, select_radio);
efl_event_callback_add(radio, EFL_UI_RADIO_EVENT_CHANGED, _select_radio_changed, list);
efl_pack_end(bbox, radio);
radio = efl_add(EFL_UI_RADIO_CLASS, wbox);
efl_text_set(radio, "MULTI");
efl_ui_radio_state_value_set(radio, EFL_UI_SELECT_MULTI);
efl_ui_radio_state_value_set(radio, EFL_UI_SELECT_MODE_MULTI);
efl_ui_radio_group_add(radio, select_radio);
efl_event_callback_add(radio, EFL_UI_RADIO_EVENT_CHANGED, _select_radio_changed, list);
efl_pack_end(bbox, radio);
radio = efl_add(EFL_UI_RADIO_CLASS, wbox);
efl_text_set(radio, "NONE");
efl_ui_radio_state_value_set(radio, EFL_UI_SELECT_NONE);
efl_ui_radio_state_value_set(radio, EFL_UI_SELECT_MODE_NONE);
efl_ui_radio_group_add(radio, select_radio);
efl_event_callback_add(radio, EFL_UI_RADIO_EVENT_CHANGED, _select_radio_changed, list);
efl_pack_end(bbox, radio);

1
src/lib/efl/interfaces/efl_ui_multi_selectable.eo
View File

@ -1,6 +1,5 @@
enum Efl.Ui.Select_Mode {
[[Type of multi selectable object.]]
legacy: efl_ui_select;
single, [[Only single child is selected. if the child is selected,
previous selected child will be unselected.]]
single_always, [[Same as single select except, this will be selected

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

@ -576,7 +576,7 @@ _efl_ui_grid_efl_object_finalize(Eo *obj,
efl_ui_scroll_manager_pan_set(pd->smanager, pd->pan);
edje_object_part_swallow(wd->resize_obj, "efl.content", pd->pan);
pd->select_mode = EFL_UI_SELECT_SINGLE;
pd->select_mode = EFL_UI_SELECT_MODE_SINGLE;
if ((pd->item.size.w == 0) && (pd->item.size.h == 0))
{
@ -891,7 +891,7 @@ _grid_item_selected(void *data, const Efl_Event *event)
EFL_UI_GRID_DATA_GET_OR_RETURN(obj, pd);
/* Single Select */
if (pd->select_mode != EFL_UI_SELECT_MULTI)
if (pd->select_mode != EFL_UI_SELECT_MODE_MULTI)
{
EINA_LIST_FREE(pd->selected, selected)
{
@ -1222,9 +1222,9 @@ _efl_ui_grid_efl_ui_multi_selectable_select_mode_set(Eo *obj EINA_UNUSED,
{
Efl_Ui_Grid_Item *selected;
if ((pd->select_mode == EFL_UI_SELECT_MULTI &&
mode != EFL_UI_SELECT_MULTI) ||
mode == EFL_UI_SELECT_NONE)
if ((pd->select_mode == EFL_UI_SELECT_MODE_MULTI &&
mode != EFL_UI_SELECT_MODE_MULTI) ||
mode == EFL_UI_SELECT_MODE_NONE)
{
Eina_List *clone = eina_list_clone(pd->selected);
EINA_LIST_FREE(clone, selected)

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

@ -19,9 +19,9 @@ static void
_item_select(Eo *obj, Efl_Ui_Item_Data *pd)
{
if (pd->selected &&
(*(pd->select_mode) != EFL_UI_SELECT_SINGLE_ALWAYS))
(*(pd->select_mode) != EFL_UI_SELECT_MODE_SINGLE_ALWAYS))
return;
if (*(pd->select_mode) == EFL_UI_SELECT_NONE) return;
if (*(pd->select_mode) == EFL_UI_SELECT_MODE_NONE) return;
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
@ -101,9 +101,9 @@ _item_mouse_up(void *data,
edje_object_signal_emit(wd->resize_obj, "efl,state,unpressed", "efl");
efl_event_callback_call(item, EFL_UI_EVENT_UNPRESSED, NULL);
if ((*(pd->select_mode) != EFL_UI_SELECT_SINGLE_ALWAYS) && (pd->selected))
if ((*(pd->select_mode) != EFL_UI_SELECT_MODE_SINGLE_ALWAYS) && (pd->selected))
_item_unselect(item, pd);
else if (*(pd->select_mode) != EFL_UI_SELECT_NONE)
else if (*(pd->select_mode) != EFL_UI_SELECT_MODE_NONE)
_item_select(item, pd);
}

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

@ -444,7 +444,7 @@ _efl_ui_list_efl_object_finalize(Eo *obj,
efl_ui_mirrored_set(pd->box, efl_ui_mirrored_get(obj));
efl_content_set(pd->pan, pd->box);
pd->select_mode = EFL_UI_SELECT_SINGLE;
pd->select_mode = EFL_UI_SELECT_MODE_SINGLE;
_scroll_edje_object_attach(obj);
@ -646,7 +646,7 @@ _list_item_selected(void *data, const Efl_Event *event)
EFL_UI_LIST_DATA_GET_OR_RETURN(obj, pd);
/* Single Select */
if (pd->select_mode != EFL_UI_SELECT_MULTI)
if (pd->select_mode != EFL_UI_SELECT_MODE_MULTI)
{
EINA_LIST_FREE(pd->selected, selected)
{
@ -935,9 +935,9 @@ _efl_ui_list_efl_ui_multi_selectable_select_mode_set(Eo *obj EINA_UNUSED,
{
Efl_Ui_List_Item *selected;
if ((pd->select_mode == EFL_UI_SELECT_MULTI &&
mode != EFL_UI_SELECT_MULTI) ||
mode == EFL_UI_SELECT_NONE)
if ((pd->select_mode == EFL_UI_SELECT_MODE_MULTI &&
mode != EFL_UI_SELECT_MODE_MULTI) ||
mode == EFL_UI_SELECT_MODE_NONE)
{
Eina_List *clone = eina_list_clone(pd->selected);
EINA_LIST_FREE(clone, selected)