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

Evas: Rename Selectable_Interface to Efl.Ui.Selectable

This commit is contained in:
Jean-Philippe Andre 2016-06-10 17:58:17 +09:00
parent 31c4fd1f7c
commit b2355d7da3
29 changed files with 59 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile_Evas.am
View File

@ -13,7 +13,7 @@ evas_eolian_pub_files = \
lib/evas/canvas/efl_ui_draggable.eo \
lib/evas/canvas/efl_ui_clickable.eo \
lib/evas/canvas/efl_ui_scrollable.eo \
lib/evas/canvas/evas_selectable_interface.eo \
lib/evas/canvas/efl_ui_selectable.eo \
lib/evas/canvas/evas_zoomable_interface.eo \
lib/evas/canvas/evas_canvas3d_camera.eo\
lib/evas/canvas/evas_canvas3d_texture.eo\

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

@ -1129,7 +1129,7 @@ _on_item_selected(void *data, const Eo_Event *event)
// EVENTS: should not call legacy
//eo_event_callback_call
// (data, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, (void *)it_data->model);
// (data, EFL_UI_EVENT_SELECTED, (void *)it_data->model);
evas_object_smart_callback_call(data, "selected", (void *)it_data->path);
}
else if (sd->multi && it_data->is_dir && sd->double_tap_navigation)
@ -1371,7 +1371,7 @@ _text_activated_is_dir_then(void *data, void *value)
{
// EVENTS: should not call legacy
//eo_event_callback_call
// (fs, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, (void *)model);
// (fs, EFL_UI_EVENT_SELECTED, (void *)model);
evas_object_smart_callback_call(fs, "selected", (void *) str);
}
}
@ -1390,7 +1390,7 @@ _text_activated_is_dir_then(void *data, void *value)
{
// EVENTS: should not call legacy
//eo_event_callback_call
// (fs, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, (void *)model);
// (fs, EFL_UI_EVENT_SELECTED, (void *)model);
evas_object_smart_callback_call(fs, "selected", (void *) str);
}
}
@ -1429,7 +1429,7 @@ _on_text_activated_set_path_then_error(void *data, Eina_Error err EINA_UNUSED)
// EVENTS: should not call legacy
//eo_event_callback_call
// (fs, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, (void *)model);
// (fs, EFL_UI_EVENT_SELECTED, (void *)model);
evas_object_smart_callback_call(fs, "selected", (void *)str);
// EVENTS: should not call legacy
@ -1586,9 +1586,9 @@ _files_list_add(Evas_Object *obj)
elm_widget_mirrored_automatic_set(li, EINA_FALSE);
eo_event_callback_add
(li, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, _on_item_selected, obj);
(li, EFL_UI_EVENT_SELECTED, _on_item_selected, obj);
eo_event_callback_add
(li, EVAS_SELECTABLE_INTERFACE_EVENT_UNSELECTED, _on_item_unselected, obj);
(li, EFL_UI_EVENT_UNSELECTED, _on_item_unselected, obj);
eo_event_callback_add
(li, ELM_GENLIST_EVENT_ACTIVATED, _on_item_activated, obj);
eo_event_callback_add
@ -1623,9 +1623,9 @@ _files_grid_add(Evas_Object *obj)
elm_gengrid_align_set(grid, 0.0, 0.0);
eo_event_callback_add
(grid, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, _on_item_selected, obj);
(grid, EFL_UI_EVENT_SELECTED, _on_item_selected, obj);
eo_event_callback_add
(grid, EVAS_SELECTABLE_INTERFACE_EVENT_UNSELECTED, _on_item_unselected, obj);
(grid, EFL_UI_EVENT_UNSELECTED, _on_item_unselected, obj);
eo_event_callback_add
(grid, ELM_GENGRID_EVENT_ACTIVATED, _on_item_activated, obj);
eo_event_callback_add

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

@ -60,9 +60,9 @@ SIG_FWD(CLICKED, EFL_UI_EVENT_CLICKED)
SIG_FWD(CLICKED_DOUBLE, EFL_UI_EVENT_CLICKED_DOUBLE)
SIG_FWD(FOCUSED, ELM_WIDGET_EVENT_FOCUSED)
SIG_FWD(UNFOCUSED, ELM_WIDGET_EVENT_UNFOCUSED)
SIG_FWD(SELECTION_PASTE, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_PASTE)
SIG_FWD(SELECTION_COPY, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_COPY)
SIG_FWD(SELECTION_CUT, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_CUT)
SIG_FWD(SELECTION_PASTE, EFL_UI_EVENT_SELECTION_PASTE)
SIG_FWD(SELECTION_COPY, EFL_UI_EVENT_SELECTION_COPY)
SIG_FWD(SELECTION_CUT, EFL_UI_EVENT_SELECTION_CUT)
SIG_FWD(UNPRESSED, EFL_UI_EVENT_UNPRESSED)
#undef SIG_FWD
@ -357,9 +357,9 @@ _elm_fileselector_entry_evas_object_smart_add(Eo *obj, Elm_Fileselector_Entry_Da
SIG_FWD(CLICKED_DOUBLE, EFL_UI_EVENT_CLICKED_DOUBLE);
SIG_FWD(FOCUSED, ELM_WIDGET_EVENT_FOCUSED);
SIG_FWD(UNFOCUSED, ELM_WIDGET_EVENT_UNFOCUSED);
SIG_FWD(SELECTION_PASTE, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_PASTE);
SIG_FWD(SELECTION_COPY, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_COPY);
SIG_FWD(SELECTION_CUT, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_CUT);
SIG_FWD(SELECTION_PASTE, EFL_UI_EVENT_SELECTION_PASTE);
SIG_FWD(SELECTION_COPY, EFL_UI_EVENT_SELECTION_COPY);
SIG_FWD(SELECTION_CUT, EFL_UI_EVENT_SELECTION_CUT);
#undef SIG_FWD
if (!elm_layout_theme_set

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

@ -163,7 +163,7 @@ _on_item_clicked(void *data EINA_UNUSED, const Eo_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);
eo_event_callback_call(obj2, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, eo_it);
eo_event_callback_call(obj2, EFL_UI_EVENT_SELECTED, eo_it);
evas_object_event_callback_add(sd->hover, EVAS_CALLBACK_DEL, _auto_update, item);

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

@ -233,15 +233,15 @@ _button_animator(void *data)
if ((!sd->final_position) &&
(sd->enabled_position & ELM_ACTIONSLIDER_LEFT))
eo_event_callback_call
(obj, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, (char *)left);
(obj, EFL_UI_EVENT_SELECTED, (char *)left);
else if ((sd->final_position == 0.5) &&
(sd->enabled_position & ELM_ACTIONSLIDER_CENTER))
eo_event_callback_call
(obj, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, (char *)center);
(obj, EFL_UI_EVENT_SELECTED, (char *)center);
else if ((sd->final_position == 1) &&
(sd->enabled_position & ELM_ACTIONSLIDER_RIGHT))
eo_event_callback_call
(obj, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, (char *)right);
(obj, EFL_UI_EVENT_SELECTED, (char *)right);
sd->button_animator = NULL;
@ -279,7 +279,7 @@ _drag_button_up_cb(void *data,
{
sd->final_position = 0;
eo_event_callback_call
(obj, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, (char *)left);
(obj, EFL_UI_EVENT_SELECTED, (char *)left);
return;
}
@ -289,7 +289,7 @@ _drag_button_up_cb(void *data,
{
sd->final_position = 0.5;
eo_event_callback_call
(obj, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, (char *)center);
(obj, EFL_UI_EVENT_SELECTED, (char *)center);
ecore_animator_del(sd->button_animator);
sd->button_animator = ecore_animator_add(_button_animator, obj);
@ -303,7 +303,7 @@ _drag_button_up_cb(void *data,
{
sd->final_position = 1;
eo_event_callback_call
(obj, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, (char *)right);
(obj, EFL_UI_EVENT_SELECTED, (char *)right);
return;
}

2
src/lib/elementary/elm_actionslider.eo
View File

@ -10,7 +10,7 @@ enum Elm.Actionslider.Pos
all = (1 << 3) - 1 [[All positions for left/center/right.]]
}
class Elm.Actionslider (Elm.Layout, Evas.Selectable_Interface)
class Elm.Actionslider (Elm.Layout, Efl.Ui.Selectable)
{
[[An actionslider is a switcher for 2 or 3 labels

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

@ -736,7 +736,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);
eo_event_callback_add
(gl, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, _colorclass_activate, cc);
(gl, EFL_UI_EVENT_SELECTED, _colorclass_activate, cc);
cc->reset = bt = elm_button_add(ly);
elm_object_style_set(bt, "colorclass");

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

@ -1,4 +1,4 @@
class Elm.Combobox (Elm.Button, Evas.Selectable_Interface,
class Elm.Combobox (Elm.Button, Efl.Ui.Selectable,
Elm.Interface.Atspi_Widget_Action,
Elm.Entry, Elm.Genlist, Elm.Hover, Elm.Multibuttonentry)
{

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

@ -90,7 +90,7 @@ _item_select(Elm_Diskselector_Item_Data *it)
if (it->func) it->func((void *)WIDGET_ITEM_DATA_GET(eo_it), WIDGET(it), eo_it);
eo_event_callback_call
(WIDGET(it), EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, eo_it);
(WIDGET(it), EFL_UI_EVENT_SELECTED, eo_it);
}
static int

2
src/lib/elementary/elm_diskselector.eo
View File

@ -1,7 +1,7 @@
class Elm.Diskselector (Elm.Widget, Elm.Interface_Scrollable,
Elm.Interface.Atspi_Widget_Action,
Efl.Ui.Clickable, Efl.Ui.Scrollable,
Evas.Selectable_Interface)
Efl.Ui.Selectable)
{
legacy_prefix: elm_diskselector;
eo_prefix: elm_obj_diskselector;

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

@ -1500,7 +1500,7 @@ _paste_cb(void *data,
ELM_ENTRY_DATA_GET(data, sd);
eo_event_callback_call
(data, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_PASTE, NULL);
(data, EFL_UI_EVENT_SELECTION_PASTE, NULL);
sd->selection_asked = EINA_TRUE;
@ -1552,7 +1552,7 @@ _cut_cb(void *data,
ELM_ENTRY_DATA_GET(data, sd);
eo_event_callback_call
(data, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_CUT, NULL);
(data, EFL_UI_EVENT_SELECTION_CUT, NULL);
/* Store it */
sd->sel_mode = EINA_FALSE;
if (!_elm_config->desktop_entry)
@ -1575,7 +1575,7 @@ _copy_cb(void *data,
ELM_ENTRY_DATA_GET(data, sd);
eo_event_callback_call
(data, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_COPY, NULL);
(data, EFL_UI_EVENT_SELECTION_COPY, NULL);
sd->sel_mode = EINA_FALSE;
if (!_elm_config->desktop_entry)
{
@ -2217,7 +2217,7 @@ _entry_selection_start_signal_cb(void *data,
if (entry != data) elm_entry_select_none(entry);
}
eo_event_callback_call
(data, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_START, NULL);
(data, EFL_UI_EVENT_SELECTION_START, NULL);
elm_object_focus_set(data, EINA_TRUE);
}
@ -2250,7 +2250,7 @@ _entry_selection_changed_signal_cb(void *data,
sd->have_selection = EINA_TRUE;
eo_event_callback_call
(data, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_CHANGED, NULL);
(data, EFL_UI_EVENT_SELECTION_CHANGED, NULL);
_selection_store(ELM_SEL_TYPE_PRIMARY, data);
_update_selection_handler(data);
if (_elm_config->atspi_mode)
@ -2269,7 +2269,7 @@ _entry_selection_cleared_signal_cb(void *data,
sd->have_selection = EINA_FALSE;
eo_event_callback_call
(data, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_CLEARED, NULL);
(data, EFL_UI_EVENT_SELECTION_CLEARED, NULL);
if (sd->cut_sel)
{
elm_cnp_selection_set
@ -2301,7 +2301,7 @@ _entry_paste_request_signal_cb(void *data,
if (!sd->editable) return;
eo_event_callback_call
(data, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_PASTE, NULL);
(data, EFL_UI_EVENT_SELECTION_PASTE, NULL);
top = elm_widget_top_get(data);
if ((top) && (elm_win_window_id_get(top)))
@ -4209,7 +4209,7 @@ _elm_entry_select_none(Eo *obj EINA_UNUSED, Elm_Entry_Data *sd)
}
if (sd->have_selection)
eo_event_callback_call
(obj, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_CLEARED, NULL);
(obj, EFL_UI_EVENT_SELECTION_CLEARED, NULL);
sd->have_selection = EINA_FALSE;
edje_object_part_text_select_none(sd->entry_edje, "elm.text");

2
src/lib/elementary/elm_entry.eo
View File

@ -116,7 +116,7 @@ enum Elm.Cnp_Mode
class Elm.Entry (Elm.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
Elm.Interface.Atspi.Text, Elm.Interface.Atspi.Text.Editable, Efl.File,
Evas.Selectable_Interface, Efl.Ui.Scrollable)
Efl.Ui.Selectable, Efl.Ui.Scrollable)
{
legacy_prefix: elm_entry;
eo_prefix: elm_obj_entry;

2
src/lib/elementary/elm_fileselector.eo
View File

@ -1,6 +1,6 @@
class Elm.Fileselector (Elm.Layout, Elm.Interface.Fileselector,
Elm.Interface.Atspi_Widget_Action,
Efl.Ui.Clickable, Evas.Selectable_Interface)
Efl.Ui.Clickable, Efl.Ui.Selectable)
{
legacy_prefix: elm_fileselector;
eo_prefix: elm_obj_fileselector;

2
src/lib/elementary/elm_fileselector_entry.eo
View File

@ -1,5 +1,5 @@
class Elm.Fileselector_Entry (Elm.Layout, Elm.Interface.Fileselector,
Efl.Ui.Clickable, Evas.Selectable_Interface)
Efl.Ui.Clickable, Efl.Ui.Selectable)
{
[[Not an EO API.]]
event_prefix: elm_fileselector_entry;

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

@ -231,7 +231,7 @@ _on_item_changed(Elm_Flipselector_Data *sd)
if (item->func)
item->func((void *)WIDGET_ITEM_DATA_GET(eo_item), WIDGET(item), eo_item);
eo_event_callback_call
(sd->obj, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, eo_item);
(sd->obj, EFL_UI_EVENT_SELECTED, eo_item);
}
static void

2
src/lib/elementary/elm_flipselector.eo
View File

@ -1,6 +1,6 @@
class Elm.Flipselector (Elm.Layout, Efl.Ui.Spin,
Elm.Interface.Atspi_Widget_Action,
Evas.Selectable_Interface)
Efl.Ui.Selectable)
{
legacy_prefix: elm_flipselector;
eo_prefix: elm_obj_flipselector;

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

@ -513,7 +513,7 @@ _item_unselect(Elm_Gen_Item *it)
it->selected = EINA_FALSE;
sd->selected = eina_list_remove(sd->selected, eo_it);
eo_event_callback_call
(WIDGET(it), EVAS_SELECTABLE_INTERFACE_EVENT_UNSELECTED, eo_it);
(WIDGET(it), EFL_UI_EVENT_UNSELECTED, eo_it);
if (_elm_config->atspi_mode)
elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_SELECTED, EINA_FALSE);
}
@ -4140,7 +4140,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)
{
eo_event_callback_call(WIDGET(it), EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, eo_it);
eo_event_callback_call(WIDGET(it), EFL_UI_EVENT_SELECTED, eo_it);
if (_elm_config->atspi_mode)
elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_SELECTED, EINA_TRUE);
}

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

@ -3793,7 +3793,7 @@ _item_unselect(Elm_Gen_Item *it)
it->selected = EINA_FALSE;
sd->selected = eina_list_remove(sd->selected, EO_OBJ(it));
eo_event_callback_call
(WIDGET(it), EVAS_SELECTABLE_INTERFACE_EVENT_UNSELECTED, EO_OBJ(it));
(WIDGET(it), EFL_UI_EVENT_UNSELECTED, EO_OBJ(it));
if (_elm_config->atspi_mode)
elm_interface_atspi_accessible_state_changed_signal_emit(EO_OBJ(it), ELM_ATSPI_STATE_SELECTED, EINA_FALSE);
}
@ -5833,7 +5833,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;
eo_event_callback_call(WIDGET(it), EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, eo_it);
eo_event_callback_call(WIDGET(it), EFL_UI_EVENT_SELECTED, eo_it);
if (_elm_config->atspi_mode)
elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_SELECTED, EINA_TRUE);
// delete item if it's requested deletion in the above callbacks.

2
src/lib/elementary/elm_genlist.eo
View File

@ -4,7 +4,7 @@ import elm_genlist_item;
class Elm.Genlist (Elm.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
Elm.Interface.Atspi_Widget_Action, Elm.Interface.Atspi.Selection,
Evas.Selectable_Interface)
Efl.Ui.Selectable)
{
legacy_prefix: elm_genlist;
eo_prefix: elm_obj_genlist;

2
src/lib/elementary/elm_hoversel.eo
View File

@ -1,5 +1,5 @@
import elm_icon;
class Elm.Hoversel (Elm.Button, Evas.Selectable_Interface,
class Elm.Hoversel (Elm.Button, Efl.Ui.Selectable,
Efl.Ui.Clickable,
Elm.Interface.Atspi_Widget_Action)
{

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

@ -858,7 +858,7 @@ _on_mouse_up(void *data,
eo_event_callback_call
(data, EFL_UI_EVENT_CLICKED, eo_item);
eo_event_callback_call
(data, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, eo_item);
(data, EFL_UI_EVENT_SELECTED, eo_item);
eo_id_item = eo_item;
ELM_INDEX_ITEM_DATA_GET(eo_id_item, id_item);
if (id_item->func)
@ -1349,7 +1349,7 @@ _elm_index_item_selected_set(Eo *eo_it,
eo_event_callback_call
(obj, ELM_INDEX_EVENT_CHANGED, eo_it);
eo_event_callback_call
(obj, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, eo_it);
(obj, EFL_UI_EVENT_SELECTED, eo_it);
ecore_timer_del(sd->delay);
sd->delay = ecore_timer_add(sd->delay_change_time,
_delay_change_cb, obj);

2
src/lib/elementary/elm_index.eo
View File

@ -1,5 +1,5 @@
class Elm.Index (Elm.Layout, Efl.Orientation,
Efl.Ui.Clickable, Evas.Selectable_Interface)
Efl.Ui.Clickable, Efl.Ui.Selectable)
{
legacy_prefix: elm_index;
eo_prefix: elm_obj_index;

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

@ -1413,7 +1413,7 @@ call:
_elm_list_walk(sd);
if (it->func) it->func((void *)WIDGET_ITEM_DATA_GET(eo_it), WIDGET(it), eo_it);
eo_event_callback_call(obj, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, eo_it);
eo_event_callback_call(obj, EFL_UI_EVENT_SELECTED, eo_it);
if (_elm_config->atspi_mode)
elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_SELECTED, EINA_TRUE);
sd->last_selected_item = eo_it;
@ -1483,7 +1483,7 @@ _item_unselect(Elm_List_Item_Data *it)
if (!(it->base->disabled ||
(sd->select_mode == ELM_OBJECT_SELECT_MODE_NONE)))
eo_event_callback_call
(WIDGET(it), EVAS_SELECTABLE_INTERFACE_EVENT_UNSELECTED, EO_OBJ(it));
(WIDGET(it), EFL_UI_EVENT_UNSELECTED, EO_OBJ(it));
if (_elm_config->atspi_mode)
elm_interface_atspi_accessible_state_changed_signal_emit(EO_OBJ(it), ELM_ATSPI_STATE_SELECTED, EINA_FALSE);
}

2
src/lib/elementary/elm_list.eo
View File

@ -38,7 +38,7 @@ enum Elm.List.Mode
class Elm.List (Elm.Layout, Elm.Interface_Scrollable,
Elm.Interface.Atspi_Widget_Action, Elm.Interface.Atspi.Selection,
Efl.Ui.Clickable, Evas.Selectable_Interface)
Efl.Ui.Clickable, Efl.Ui.Selectable)
{
legacy_prefix: elm_list;
eo_prefix: elm_obj_list;

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

@ -159,7 +159,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");
eo_event_callback_call(WIDGET(item), EVAS_SELECTABLE_INTERFACE_EVENT_UNSELECTED, EO_OBJ(item));
eo_event_callback_call(WIDGET(item), EFL_UI_EVENT_UNSELECTED, EO_OBJ(item));
if (_elm_config->atspi_mode)
elm_interface_atspi_accessible_state_changed_signal_emit(EO_OBJ(item), ELM_ATSPI_STATE_SELECTED, EINA_FALSE);
}
@ -1174,7 +1174,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));
}
eo_event_callback_call(obj, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, EO_OBJ(it));
eo_event_callback_call(obj, EFL_UI_EVENT_SELECTED, EO_OBJ(it));
if (_elm_config->atspi_mode)
elm_interface_atspi_accessible_state_changed_signal_emit(EO_OBJ(it), ELM_ATSPI_STATE_SELECTED, EINA_TRUE);
}

2
src/lib/elementary/elm_toolbar.eo
View File

@ -26,7 +26,7 @@ enum Elm.Toolbar.Shrink_Mode
class Elm.Toolbar (Elm.Widget, Elm.Interface_Scrollable, Efl.Orientation,
Elm.Interface.Atspi_Widget_Action, Elm.Interface.Atspi.Selection,
Efl.Ui.Clickable, Evas.Selectable_Interface)
Efl.Ui.Clickable, Efl.Ui.Selectable)
{
legacy_prefix: elm_toolbar;
eo_prefix: elm_obj_toolbar;

2
src/lib/evas/Evas_Eo.h
View File

@ -5,7 +5,7 @@
#include "canvas/efl_ui_draggable.eo.h"
#include "canvas/efl_ui_clickable.eo.h"
#include "canvas/efl_ui_scrollable.eo.h"
#include "canvas/evas_selectable_interface.eo.h"
#include "canvas/efl_ui_selectable.eo.h"
#include "canvas/evas_zoomable_interface.eo.h"
#include "canvas/evas_canvas.eo.h"

2
src/lib/evas/canvas/common_interfaces.c
View File

@ -4,5 +4,5 @@
#include "canvas/efl_ui_draggable.eo.c"
#include "canvas/efl_ui_clickable.eo.c"
#include "canvas/efl_ui_scrollable.eo.c"
#include "canvas/evas_selectable_interface.eo.c"
#include "canvas/efl_ui_selectable.eo.c"
#include "canvas/evas_zoomable_interface.eo.c"

3
src/lib/evas/canvas/evas_selectable_interface.eo → src/lib/evas/canvas/efl_ui_selectable.eo
View File

@ -1,5 +1,6 @@
interface Evas.Selectable_Interface ()
interface Efl.Ui.Selectable ()
{
event_prefix: efl_ui;
events {
selected;
unselected;