forked from enlightenment/efl
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:
parent
ef5853b6d5
commit
461c45df46
|
@ -235,24 +235,24 @@ elm_main(int argc EINA_UNUSED, char **argv)
|
||||||
|
|
||||||
select_radio = radio = efl_add(EFL_UI_RADIO_CLASS, wbox);
|
select_radio = radio = efl_add(EFL_UI_RADIO_CLASS, wbox);
|
||||||
efl_text_set(radio, "SINGLE");
|
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_event_callback_add(radio, EFL_UI_RADIO_EVENT_CHANGED, _select_radio_changed, list);
|
||||||
efl_pack_end(bbox, radio);
|
efl_pack_end(bbox, radio);
|
||||||
radio = efl_add(EFL_UI_RADIO_CLASS, wbox);
|
radio = efl_add(EFL_UI_RADIO_CLASS, wbox);
|
||||||
efl_text_set(radio, "SINGLE_ALWAYS");
|
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_ui_radio_group_add(radio, select_radio);
|
||||||
efl_event_callback_add(radio, EFL_UI_RADIO_EVENT_CHANGED, _select_radio_changed, list);
|
efl_event_callback_add(radio, EFL_UI_RADIO_EVENT_CHANGED, _select_radio_changed, list);
|
||||||
efl_pack_end(bbox, radio);
|
efl_pack_end(bbox, radio);
|
||||||
radio = efl_add(EFL_UI_RADIO_CLASS, wbox);
|
radio = efl_add(EFL_UI_RADIO_CLASS, wbox);
|
||||||
efl_text_set(radio, "MULTI");
|
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_ui_radio_group_add(radio, select_radio);
|
||||||
efl_event_callback_add(radio, EFL_UI_RADIO_EVENT_CHANGED, _select_radio_changed, list);
|
efl_event_callback_add(radio, EFL_UI_RADIO_EVENT_CHANGED, _select_radio_changed, list);
|
||||||
efl_pack_end(bbox, radio);
|
efl_pack_end(bbox, radio);
|
||||||
radio = efl_add(EFL_UI_RADIO_CLASS, wbox);
|
radio = efl_add(EFL_UI_RADIO_CLASS, wbox);
|
||||||
efl_text_set(radio, "NONE");
|
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_ui_radio_group_add(radio, select_radio);
|
||||||
efl_event_callback_add(radio, EFL_UI_RADIO_EVENT_CHANGED, _select_radio_changed, list);
|
efl_event_callback_add(radio, EFL_UI_RADIO_EVENT_CHANGED, _select_radio_changed, list);
|
||||||
efl_pack_end(bbox, radio);
|
efl_pack_end(bbox, radio);
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
enum Efl.Ui.Select_Mode {
|
enum Efl.Ui.Select_Mode {
|
||||||
[[Type of multi selectable object.]]
|
[[Type of multi selectable object.]]
|
||||||
legacy: efl_ui_select;
|
|
||||||
single, [[Only single child is selected. if the child is selected,
|
single, [[Only single child is selected. if the child is selected,
|
||||||
previous selected child will be unselected.]]
|
previous selected child will be unselected.]]
|
||||||
single_always, [[Same as single select except, this will be selected
|
single_always, [[Same as single select except, this will be selected
|
||||||
|
|
|
@ -576,7 +576,7 @@ _efl_ui_grid_efl_object_finalize(Eo *obj,
|
||||||
efl_ui_scroll_manager_pan_set(pd->smanager, pd->pan);
|
efl_ui_scroll_manager_pan_set(pd->smanager, pd->pan);
|
||||||
edje_object_part_swallow(wd->resize_obj, "efl.content", 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))
|
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);
|
EFL_UI_GRID_DATA_GET_OR_RETURN(obj, pd);
|
||||||
|
|
||||||
/* Single Select */
|
/* 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)
|
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;
|
Efl_Ui_Grid_Item *selected;
|
||||||
|
|
||||||
if ((pd->select_mode == EFL_UI_SELECT_MULTI &&
|
if ((pd->select_mode == EFL_UI_SELECT_MODE_MULTI &&
|
||||||
mode != EFL_UI_SELECT_MULTI) ||
|
mode != EFL_UI_SELECT_MODE_MULTI) ||
|
||||||
mode == EFL_UI_SELECT_NONE)
|
mode == EFL_UI_SELECT_MODE_NONE)
|
||||||
{
|
{
|
||||||
Eina_List *clone = eina_list_clone(pd->selected);
|
Eina_List *clone = eina_list_clone(pd->selected);
|
||||||
EINA_LIST_FREE(clone, selected)
|
EINA_LIST_FREE(clone, selected)
|
||||||
|
|
|
@ -19,9 +19,9 @@ static void
|
||||||
_item_select(Eo *obj, Efl_Ui_Item_Data *pd)
|
_item_select(Eo *obj, Efl_Ui_Item_Data *pd)
|
||||||
{
|
{
|
||||||
if (pd->selected &&
|
if (pd->selected &&
|
||||||
(*(pd->select_mode) != EFL_UI_SELECT_SINGLE_ALWAYS))
|
(*(pd->select_mode) != EFL_UI_SELECT_MODE_SINGLE_ALWAYS))
|
||||||
return;
|
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);
|
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");
|
edje_object_signal_emit(wd->resize_obj, "efl,state,unpressed", "efl");
|
||||||
efl_event_callback_call(item, EFL_UI_EVENT_UNPRESSED, NULL);
|
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);
|
_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);
|
_item_select(item, pd);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -444,7 +444,7 @@ _efl_ui_list_efl_object_finalize(Eo *obj,
|
||||||
efl_ui_mirrored_set(pd->box, efl_ui_mirrored_get(obj));
|
efl_ui_mirrored_set(pd->box, efl_ui_mirrored_get(obj));
|
||||||
efl_content_set(pd->pan, pd->box);
|
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);
|
_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);
|
EFL_UI_LIST_DATA_GET_OR_RETURN(obj, pd);
|
||||||
|
|
||||||
/* Single Select */
|
/* 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)
|
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;
|
Efl_Ui_List_Item *selected;
|
||||||
|
|
||||||
if ((pd->select_mode == EFL_UI_SELECT_MULTI &&
|
if ((pd->select_mode == EFL_UI_SELECT_MODE_MULTI &&
|
||||||
mode != EFL_UI_SELECT_MULTI) ||
|
mode != EFL_UI_SELECT_MODE_MULTI) ||
|
||||||
mode == EFL_UI_SELECT_NONE)
|
mode == EFL_UI_SELECT_MODE_NONE)
|
||||||
{
|
{
|
||||||
Eina_List *clone = eina_list_clone(pd->selected);
|
Eina_List *clone = eina_list_clone(pd->selected);
|
||||||
EINA_LIST_FREE(clone, selected)
|
EINA_LIST_FREE(clone, selected)
|
||||||
|
|
Loading…
Reference in New Issue