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

elm: do not use eo events here 

Summary:
we want to rename it, and this would break legacy behaviour, so better
this way.
Depends on D8412

Reviewers: zmike

Reviewed By: zmike

Subscribers: cedric, #reviewers, #committers

Tags: #efl

Differential Revision: https://phab.enlightenment.org/D8413
This commit is contained in:
Marcel Hollerbach 2019-03-19 16:29:45 -04:00 committed by Mike Blumenkrantz
parent c9cdb916cd
commit 9a3d4310be
8 changed files with 21 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/lib/elementary/elm_actionslider.c
View File

@ -239,16 +239,13 @@ _button_animator(void *data)
if ((!EINA_DBL_EQ(sd->final_position, 0)) &&
(sd->enabled_position & ELM_ACTIONSLIDER_LEFT))
efl_event_callback_legacy_call
(obj, EFL_UI_EVENT_SELECTED, (char *)left);
evas_object_smart_callback_call(obj, "selected",(char *)left);
else if ((EINA_DBL_EQ(sd->final_position, 0.5)) &&
(sd->enabled_position & ELM_ACTIONSLIDER_CENTER))
efl_event_callback_legacy_call
(obj, EFL_UI_EVENT_SELECTED, (char *)center);
evas_object_smart_callback_call(obj, "selected", (char *)center);
else if ((EINA_DBL_EQ(sd->final_position, 1)) &&
(sd->enabled_position & ELM_ACTIONSLIDER_RIGHT))
efl_event_callback_legacy_call
(obj, EFL_UI_EVENT_SELECTED, (char *)right);
evas_object_smart_callback_call(obj, "selected", (char *)right);
sd->button_animator = NULL;
@ -285,8 +282,7 @@ _drag_button_up_cb(void *data,
(efl_ui_mirrored_get(obj) && EINA_DBL_EQ(position, 1.0))))
{
sd->final_position = 0;
efl_event_callback_legacy_call
(obj, EFL_UI_EVENT_SELECTED, (char *)left);
evas_object_smart_callback_call(obj, "selected", (char *)left);
return;
}
@ -295,8 +291,7 @@ _drag_button_up_cb(void *data,
(sd->enabled_position & ELM_ACTIONSLIDER_CENTER))
{
sd->final_position = 0.5;
efl_event_callback_legacy_call
(obj, EFL_UI_EVENT_SELECTED, (char *)center);
evas_object_smart_callback_call(obj, "selected", (char *)center);
ecore_animator_del(sd->button_animator);
sd->button_animator = ecore_evas_animator_add(obj, _button_animator, obj);
@ -309,8 +304,7 @@ _drag_button_up_cb(void *data,
(efl_ui_mirrored_get(obj) && EINA_DBL_EQ(position, 0))))
{
sd->final_position = 1;
efl_event_callback_legacy_call
(obj, EFL_UI_EVENT_SELECTED, (char *)right);
evas_object_smart_callback_call(obj, "selected", (char *)right);
return;
}

3
src/lib/elementary/elm_diskselector.c
View File

@ -91,8 +91,7 @@ _item_select(Elm_Diskselector_Item_Data *it)
_selected_item_indicate(sd->selected_item);
if (it->func) it->func((void *)WIDGET_ITEM_DATA_GET(eo_it), WIDGET(it), eo_it);
efl_event_callback_legacy_call
(WIDGET(it), EFL_UI_EVENT_SELECTED, eo_it);
evas_object_smart_callback_call(WIDGET(it), "selected", eo_it);
}
static int

3
src/lib/elementary/elm_flipselector.c
View File

@ -233,8 +233,7 @@ _on_item_changed(Elm_Flipselector_Data *sd)
if (item->func)
item->func((void *)WIDGET_ITEM_DATA_GET(eo_item), WIDGET(item), eo_item);
efl_event_callback_legacy_call
(sd->obj, EFL_UI_EVENT_SELECTED, eo_item);
evas_object_smart_callback_call(sd->obj, "selected", eo_item);
}
static void

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

@ -721,8 +721,8 @@ _item_unselect(Elm_Gen_Item *it)
{
it->selected = EINA_FALSE;
sd->selected = eina_list_remove(sd->selected, eo_it);
efl_event_callback_legacy_call
(WIDGET(it), EFL_UI_EVENT_UNSELECTED, eo_it);
evas_object_smart_callback_call
(WIDGET(it), "unselected", eo_it);
if (_elm_config->atspi_mode)
efl_access_state_changed_signal_emit(eo_it, EFL_ACCESS_STATE_TYPE_SELECTED, EINA_FALSE);
}
@ -3958,7 +3958,7 @@ _item_select(Elm_Gen_Item *it)
if (it->func.func) it->func.func((void *)it->func.data, WIDGET(it), eo_it);
if (it->generation == sd->generation)
{
efl_event_callback_legacy_call(WIDGET(it), EFL_UI_EVENT_SELECTED, eo_it);
evas_object_smart_callback_call(WIDGET(it), "selected", eo_it);
if (_elm_config->atspi_mode)
efl_access_state_changed_signal_emit(eo_it, EFL_ACCESS_STATE_TYPE_SELECTED, EINA_TRUE);
}

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

@ -3931,8 +3931,8 @@ _item_unselect(Elm_Gen_Item *it)
it->selected = EINA_FALSE;
sd->selected = eina_list_remove(sd->selected, EO_OBJ(it));
efl_event_callback_legacy_call
(WIDGET(it), EFL_UI_EVENT_UNSELECTED, EO_OBJ(it));
evas_object_smart_callback_call
(WIDGET(it), "unselected", EO_OBJ(it));
if (_elm_config->atspi_mode)
efl_access_state_changed_signal_emit(EO_OBJ(it), EFL_ACCESS_STATE_TYPE_SELECTED, EINA_FALSE);
}
@ -6116,7 +6116,7 @@ _item_select(Elm_Gen_Item *it)
if (it->func.func) it->func.func((void *)it->func.data, WIDGET(it), eo_it);
// delete item if it's requested deletion in the above callbacks.
if ((it->base)->on_deletion) goto item_deleted;
efl_event_callback_legacy_call(WIDGET(it), EFL_UI_EVENT_SELECTED, eo_it);
evas_object_smart_callback_call(WIDGET(it), "selected", eo_it);
if (_elm_config->atspi_mode)
efl_access_state_changed_signal_emit(eo_it, EFL_ACCESS_STATE_TYPE_SELECTED, EINA_TRUE);
// delete item if it's requested deletion in the above callbacks.

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

@ -863,8 +863,7 @@ _on_mouse_up(void *data,
{
efl_event_callback_legacy_call
(data, EFL_UI_EVENT_CLICKED, eo_item);
efl_event_callback_legacy_call
(data, EFL_UI_EVENT_SELECTED, eo_item);
evas_object_smart_callback_call(data, "selected", eo_item);
eo_id_item = eo_item;
ELM_INDEX_ITEM_DATA_GET(eo_id_item, id_item);
if (id_item->func)
@ -1298,8 +1297,7 @@ _elm_index_item_selected_set(Eo *eo_it,
efl_event_callback_legacy_call
(obj, ELM_INDEX_EVENT_CHANGED, eo_it);
efl_event_callback_legacy_call
(obj, EFL_UI_EVENT_SELECTED, eo_it);
evas_object_smart_callback_call(obj, "selected", eo_it);
ecore_timer_del(sd->delay);
sd->delay = ecore_timer_add(sd->delay_change_time,
_delay_change_cb, obj);

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

@ -1448,7 +1448,7 @@ call:
_elm_list_walk(obj, sd);
if (it->func) it->func((void *)WIDGET_ITEM_DATA_GET(eo_it), WIDGET(it), eo_it);
efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SELECTED, eo_it);
evas_object_smart_callback_call(obj, "selected", eo_it);
if (_elm_config->atspi_mode)
efl_access_state_changed_signal_emit(eo_it, EFL_ACCESS_STATE_TYPE_SELECTED, EINA_TRUE);
sd->last_selected_item = eo_it;
@ -1523,8 +1523,8 @@ _item_unselect(Elm_List_Item_Data *it)
sd->selected = eina_list_remove(sd->selected, EO_OBJ(it));
if (!(it->base->disabled ||
(sd->select_mode == ELM_OBJECT_SELECT_MODE_NONE)))
efl_event_callback_legacy_call
(WIDGET(it), EFL_UI_EVENT_UNSELECTED, EO_OBJ(it));
evas_object_smart_callback_call
(WIDGET(it), "unselected", EO_OBJ(it));
if (_elm_config->atspi_mode)
efl_access_state_changed_signal_emit(EO_OBJ(it), EFL_ACCESS_STATE_TYPE_SELECTED, EINA_FALSE);
}

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

@ -178,7 +178,7 @@ _item_unselect(Elm_Toolbar_Item_Data *item)
elm_layout_signal_emit(VIEW(item), "elm,state,unselected", "elm");
if (item->icon)
elm_widget_signal_emit(item->icon, "elm,state,unselected", "elm");
efl_event_callback_legacy_call(WIDGET(item), EFL_UI_EVENT_UNSELECTED, EO_OBJ(item));
evas_object_smart_callback_call(WIDGET(item), "unselected", EO_OBJ(item));
if (_elm_config->atspi_mode)
efl_access_state_changed_signal_emit(EO_OBJ(item), EFL_ACCESS_STATE_TYPE_SELECTED, EINA_FALSE);
}
@ -1094,7 +1094,7 @@ _item_select(Elm_Toolbar_Item_Data *it)
{
if (it->func) it->func((void *)(WIDGET_ITEM_DATA_GET(EO_OBJ(it))), WIDGET(it), EO_OBJ(it));
}
efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SELECTED, EO_OBJ(it));
evas_object_smart_callback_call(obj, "selected", EO_OBJ(it));
if (_elm_config->atspi_mode)
efl_access_state_changed_signal_emit(EO_OBJ(it), EFL_ACCESS_STATE_TYPE_SELECTED, EINA_TRUE);
}