jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=c9c9e6a20900db1cf5434d5968c7b55725fc46a1
commit c9c9e6a20900db1cf5434d5968c7b55725fc46a1 Author: Jean-Philippe Andre <[email protected]> Date: Mon Oct 16 13:33:52 2017 +0900 elm: Rename Elm.Activate to Efl.Ui.Activate Note: This is an EO-only beta API. Ref T5329 --- src/lib/elementary/efl_ui_button.c | 4 ++-- src/lib/elementary/efl_ui_check.c | 4 ++-- src/lib/elementary/efl_ui_radio.c | 4 ++-- src/lib/elementary/efl_ui_slider.c | 12 ++++++------ src/lib/elementary/efl_ui_text.c | 4 ++-- src/lib/elementary/efl_ui_win.c | 6 +++--- src/lib/elementary/elm_access.c | 24 ++++++++++++------------ src/lib/elementary/elm_entry.c | 4 ++-- src/lib/elementary/elm_general.eot | 2 +- src/lib/elementary/elm_scroller.c | 12 ++++++------ src/lib/elementary/elm_widget.c | 4 ++-- src/lib/elementary/elm_widget.eo | 2 +- src/lib/elementary/elm_widget.h | 6 +++--- 13 files changed, 44 insertions(+), 44 deletions(-) diff --git a/src/lib/elementary/efl_ui_button.c b/src/lib/elementary/efl_ui_button.c index 73ebde8af8..0812c3a7e7 100644 --- a/src/lib/elementary/efl_ui_button.c +++ b/src/lib/elementary/efl_ui_button.c @@ -88,10 +88,10 @@ _efl_ui_button_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Button_Data *_pd EINA_UNUS } EOLIAN static Eina_Bool -_efl_ui_button_elm_widget_on_access_activate(Eo *obj, Efl_Ui_Button_Data *_pd EINA_UNUSED, Elm_Activate act) +_efl_ui_button_elm_widget_on_access_activate(Eo *obj, Efl_Ui_Button_Data *_pd EINA_UNUSED, Efl_Ui_Activate act) { if (elm_widget_disabled_get(obj)) return EINA_FALSE; - if (act != ELM_ACTIVATE_DEFAULT) return EINA_FALSE; + if (act != EFL_UI_ACTIVATE_DEFAULT) return EINA_FALSE; if (evas_object_freeze_events_get(obj)) return EINA_FALSE; efl_event_callback_legacy_call diff --git a/src/lib/elementary/efl_ui_check.c b/src/lib/elementary/efl_ui_check.c index 507581255f..8a487fbade 100644 --- a/src/lib/elementary/efl_ui_check.c +++ b/src/lib/elementary/efl_ui_check.c @@ -132,10 +132,10 @@ _efl_ui_check_elm_widget_widget_sub_object_del(Eo *obj, Efl_Ui_Check_Data *_pd E } EOLIAN static Eina_Bool -_efl_ui_check_elm_widget_on_access_activate(Eo *obj EINA_UNUSED, Efl_Ui_Check_Data *_pd EINA_UNUSED, Elm_Activate act) +_efl_ui_check_elm_widget_on_access_activate(Eo *obj EINA_UNUSED, Efl_Ui_Check_Data *_pd EINA_UNUSED, Efl_Ui_Activate act) { if (elm_widget_disabled_get(obj)) return EINA_FALSE; - if (act != ELM_ACTIVATE_DEFAULT) return EINA_FALSE; + if (act != EFL_UI_ACTIVATE_DEFAULT) return EINA_FALSE; _activate(obj); diff --git a/src/lib/elementary/efl_ui_radio.c b/src/lib/elementary/efl_ui_radio.c index a3be64edc2..818d73fc99 100644 --- a/src/lib/elementary/efl_ui_radio.c +++ b/src/lib/elementary/efl_ui_radio.c @@ -345,10 +345,10 @@ _efl_ui_radio_selected_object_get(Eo *obj EINA_UNUSED, Efl_Ui_Radio_Data *sd) } EOLIAN static Eina_Bool -_efl_ui_radio_elm_widget_on_access_activate(Eo *obj, Efl_Ui_Radio_Data *_pd EINA_UNUSED, Elm_Activate act) +_efl_ui_radio_elm_widget_on_access_activate(Eo *obj, Efl_Ui_Radio_Data *_pd EINA_UNUSED, Efl_Ui_Activate act) { if (elm_widget_disabled_get(obj)) return EINA_FALSE; - if (act != ELM_ACTIVATE_DEFAULT) return EINA_FALSE; + if (act != EFL_UI_ACTIVATE_DEFAULT) return EINA_FALSE; _activate(obj); diff --git a/src/lib/elementary/efl_ui_slider.c b/src/lib/elementary/efl_ui_slider.c index 050c0c65d7..cb06d1da54 100644 --- a/src/lib/elementary/efl_ui_slider.c +++ b/src/lib/elementary/efl_ui_slider.c @@ -600,20 +600,20 @@ _efl_ui_slider_elm_widget_widget_event(Eo *obj, Efl_Ui_Slider_Data *sd, const Ef } EOLIAN static Eina_Bool -_efl_ui_slider_elm_widget_on_access_activate(Eo *obj, Efl_Ui_Slider_Data *sd, Elm_Activate act) +_efl_ui_slider_elm_widget_on_access_activate(Eo *obj, Efl_Ui_Slider_Data *sd, Efl_Ui_Activate act) { if (elm_widget_disabled_get(obj)) return EINA_FALSE; - if (act == ELM_ACTIVATE_DEFAULT) return EINA_FALSE; + if (act == EFL_UI_ACTIVATE_DEFAULT) return EINA_FALSE; - if ((act == ELM_ACTIVATE_UP) || - (act == ELM_ACTIVATE_RIGHT)) + if ((act == EFL_UI_ACTIVATE_UP) || + (act == EFL_UI_ACTIVATE_RIGHT)) { if (!_is_inverted(sd->dir)) _drag_up(obj, NULL, NULL, NULL); else _drag_down(obj, NULL, NULL, NULL); } - else if ((act == ELM_ACTIVATE_DOWN) || - (act == ELM_ACTIVATE_LEFT)) + else if ((act == EFL_UI_ACTIVATE_DOWN) || + (act == EFL_UI_ACTIVATE_LEFT)) { if (!_is_inverted(sd->dir)) _drag_down(obj, NULL, NULL, NULL); diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c index a95ef7e885..b3b4756383 100644 --- a/src/lib/elementary/efl_ui_text.c +++ b/src/lib/elementary/efl_ui_text.c @@ -4051,9 +4051,9 @@ _efl_ui_text_anchor_hover_end(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd) /* END - ANCHOR HOVER */ EOLIAN static Eina_Bool -_efl_ui_text_elm_widget_on_access_activate(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, Elm_Activate act) +_efl_ui_text_elm_widget_on_access_activate(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, Efl_Ui_Activate act) { - if (act != ELM_ACTIVATE_DEFAULT) return EINA_FALSE; + if (act != EFL_UI_ACTIVATE_DEFAULT) return EINA_FALSE; EFL_UI_TEXT_DATA_GET(obj, sd); diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c index af94426b3f..79ca364c5d 100644 --- a/src/lib/elementary/efl_ui_win.c +++ b/src/lib/elementary/efl_ui_win.c @@ -3673,7 +3673,7 @@ _elm_win_client_message(void *data, ECORE_X_ATOM_E_ILLUME_ACCESS_ACTION_ACTIVATE) { _elm_access_highlight_object_activate - (sd->obj, ELM_ACTIVATE_DEFAULT); + (sd->obj, EFL_UI_ACTIVATE_DEFAULT); } else if ((unsigned int)e->data.l[1] == ECORE_X_ATOM_E_ILLUME_ACCESS_ACTION_READ) @@ -3705,13 +3705,13 @@ _elm_win_client_message(void *data, ECORE_X_ATOM_E_ILLUME_ACCESS_ACTION_UP) { _elm_access_highlight_object_activate - (sd->obj, ELM_ACTIVATE_UP); + (sd->obj, EFL_UI_ACTIVATE_UP); } else if ((unsigned int)e->data.l[1] == ECORE_X_ATOM_E_ILLUME_ACCESS_ACTION_DOWN) { _elm_access_highlight_object_activate - (sd->obj, ELM_ACTIVATE_DOWN); + (sd->obj, EFL_UI_ACTIVATE_DOWN); } } } diff --git a/src/lib/elementary/elm_access.c b/src/lib/elementary/elm_access.c index ba63237087..0dc7211a0f 100644 --- a/src/lib/elementary/elm_access.c +++ b/src/lib/elementary/elm_access.c @@ -84,7 +84,7 @@ _access_action_callback_call(Evas_Object *obj, } EOLIAN static Eina_Bool -_elm_access_elm_widget_on_access_activate(Eo *obj, void *_pd EINA_UNUSED, Elm_Activate act) +_elm_access_elm_widget_on_access_activate(Eo *obj, void *_pd EINA_UNUSED, Efl_Ui_Activate act) { int type = ELM_ACCESS_ACTION_FIRST; @@ -93,25 +93,25 @@ _elm_access_elm_widget_on_access_activate(Eo *obj, void *_pd EINA_UNUSED, Elm_Ac switch (act) { - case ELM_ACTIVATE_DEFAULT: + case EFL_UI_ACTIVATE_DEFAULT: type = ELM_ACCESS_ACTION_ACTIVATE; break; - case ELM_ACTIVATE_UP: + case EFL_UI_ACTIVATE_UP: type = ELM_ACCESS_ACTION_UP; break; - case ELM_ACTIVATE_DOWN: + case EFL_UI_ACTIVATE_DOWN: type = ELM_ACCESS_ACTION_DOWN; break; - case ELM_ACTIVATE_RIGHT: + case EFL_UI_ACTIVATE_RIGHT: break; - case ELM_ACTIVATE_LEFT: + case EFL_UI_ACTIVATE_LEFT: break; - case ELM_ACTIVATE_BACK: + case EFL_UI_ACTIVATE_BACK: type = ELM_ACCESS_ACTION_BACK; break; @@ -132,7 +132,7 @@ _elm_access_elm_widget_on_access_activate(Eo *obj, void *_pd EINA_UNUSED, Elm_Ac } /* TODO: deprecate below? */ - if (act != ELM_ACTIVATE_DEFAULT) return EINA_FALSE; + if (act != EFL_UI_ACTIVATE_DEFAULT) return EINA_FALSE; Elm_Access_Info *ac = evas_object_data_get(obj, "_elm_access"); if (!ac) return EINA_FALSE; @@ -632,7 +632,7 @@ _elm_access_activate_callback_set(Elm_Access_Info *ac, } EAPI void -_elm_access_highlight_object_activate(Evas_Object *obj, Elm_Activate act) +_elm_access_highlight_object_activate(Evas_Object *obj, Efl_Ui_Activate act) { Evas_Object *highlight; @@ -1383,15 +1383,15 @@ elm_access_action(Evas_Object *obj, const Elm_Access_Action_Type type, Elm_Acces break; case ELM_ACCESS_ACTION_ACTIVATE: - _elm_access_highlight_object_activate(obj, ELM_ACTIVATE_DEFAULT); + _elm_access_highlight_object_activate(obj, EFL_UI_ACTIVATE_DEFAULT); break; case ELM_ACCESS_ACTION_UP: - _elm_access_highlight_object_activate(obj, ELM_ACTIVATE_UP); + _elm_access_highlight_object_activate(obj, EFL_UI_ACTIVATE_UP); break; case ELM_ACCESS_ACTION_DOWN: - _elm_access_highlight_object_activate(obj, ELM_ACTIVATE_DOWN); + _elm_access_highlight_object_activate(obj, EFL_UI_ACTIVATE_DOWN); break; case ELM_ACCESS_ACTION_SCROLL: diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c index 3808817db5..e2b9a714a9 100644 --- a/src/lib/elementary/elm_entry.c +++ b/src/lib/elementary/elm_entry.c @@ -5414,9 +5414,9 @@ _elm_entry_anchor_hover_end(Eo *obj EINA_UNUSED, Elm_Entry_Data *sd) /* END - ANCHOR HOVER */ EOLIAN static Eina_Bool -_elm_entry_elm_widget_on_access_activate(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, Elm_Activate act) +_elm_entry_elm_widget_on_access_activate(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, Efl_Ui_Activate act) { - if (act != ELM_ACTIVATE_DEFAULT) return EINA_FALSE; + if (act != EFL_UI_ACTIVATE_DEFAULT) return EINA_FALSE; ELM_ENTRY_DATA_GET(obj, sd); diff --git a/src/lib/elementary/elm_general.eot b/src/lib/elementary/elm_general.eot index f41c9fa6f9..c12e10a1ed 100644 --- a/src/lib/elementary/elm_general.eot +++ b/src/lib/elementary/elm_general.eot @@ -218,7 +218,7 @@ enum Elm.Icon.Type } /* 'on_access_activate' is beta API in the Widget class */ -enum Elm.Activate +enum Efl.Ui.Activate { [[Accessibility ]] default = 0, [[Activate default]] diff --git a/src/lib/elementary/elm_scroller.c b/src/lib/elementary/elm_scroller.c index 1f669df821..9ddfce9dcd 100644 --- a/src/lib/elementary/elm_scroller.c +++ b/src/lib/elementary/elm_scroller.c @@ -262,7 +262,7 @@ _key_action_move(Evas_Object *obj, const char *params) } EOLIAN static Eina_Bool -_elm_scroller_elm_widget_on_access_activate(Eo *obj, Elm_Scroller_Data *_pd EINA_UNUSED, Elm_Activate act) +_elm_scroller_elm_widget_on_access_activate(Eo *obj, Elm_Scroller_Data *_pd EINA_UNUSED, Efl_Ui_Activate act) { Evas_Coord x = 0; Evas_Coord y = 0; @@ -272,35 +272,35 @@ _elm_scroller_elm_widget_on_access_activate(Eo *obj, Elm_Scroller_Data *_pd EINA Evas_Coord page_y = 0; if (elm_widget_disabled_get(obj)) return EINA_FALSE; - if (act == ELM_ACTIVATE_DEFAULT) return EINA_FALSE; + if (act == EFL_UI_ACTIVATE_DEFAULT) return EINA_FALSE; elm_interface_scrollable_content_pos_get(obj, &x, &y); elm_interface_scrollable_page_size_get(obj, &page_x, &page_y); elm_interface_scrollable_content_viewport_geometry_get (obj, NULL, NULL, &v_w, &v_h); - if (act == ELM_ACTIVATE_UP) + if (act == EFL_UI_ACTIVATE_UP) { if (page_y < 0) y -= -(page_y * v_h) / 100; else y -= page_y; } - else if (act == ELM_ACTIVATE_DOWN) + else if (act == EFL_UI_ACTIVATE_DOWN) { if (page_y < 0) y += -(page_y * v_h) / 100; else y += page_y; } - else if (act == ELM_ACTIVATE_LEFT) + else if (act == EFL_UI_ACTIVATE_LEFT) { if (page_x < 0) x -= -(page_x * v_w) / 100; else x -= page_x; } - else if (act == ELM_ACTIVATE_RIGHT) + else if (act == EFL_UI_ACTIVATE_RIGHT) { if (page_x < 0) x += -(page_x * v_w) / 100; diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c index cbcdd8fc2a..24c52851c1 100644 --- a/src/lib/elementary/elm_widget.c +++ b/src/lib/elementary/elm_widget.c @@ -3473,7 +3473,7 @@ _elm_widget_interest_region_mode_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data } EAPI void -elm_widget_activate(Evas_Object *obj, Elm_Activate act) +elm_widget_activate(Evas_Object *obj, Efl_Ui_Activate act) { Evas_Object *parent; Eina_Bool ret; @@ -5186,7 +5186,7 @@ _elm_widget_widget_event(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UN } EOLIAN static Eina_Bool -_elm_widget_on_access_activate(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Elm_Activate act EINA_UNUSED) +_elm_widget_on_access_activate(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Efl_Ui_Activate act EINA_UNUSED) { WRN("The %s widget does not implement the \"activate\" functions.", efl_class_name_get(efl_class_get(obj))); diff --git a/src/lib/elementary/elm_widget.eo b/src/lib/elementary/elm_widget.eo index 17f76d84b4..6c49d29ade 100644 --- a/src/lib/elementary/elm_widget.eo +++ b/src/lib/elementary/elm_widget.eo @@ -268,7 +268,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, This is an unstable API. ]] params { - @in act: Elm.Activate; [[Type of activation.]] + @in act: Efl.Ui.Activate; [[Type of activation.]] } return: bool; [[$true on success, $false otherwise]] legacy: null; /* FIXME: legacy API does extra work */ diff --git a/src/lib/elementary/elm_widget.h b/src/lib/elementary/elm_widget.h index e6feb1eedf..fd607c7995 100644 --- a/src/lib/elementary/elm_widget.h +++ b/src/lib/elementary/elm_widget.h @@ -367,7 +367,7 @@ typedef struct _Elm_Widget_Smart_Class void (*access)(Evas_Object *obj, Eina_Bool is_access); /**< 'Virtual' function on the widget being set access */ Eina_Bool (*activate)(Evas_Object *obj, - Elm_Activate act); /**< 'Virtual' function to activate widget */ + Efl_Ui_Activate act); /**< 'Virtual' function to activate widget */ } Elm_Widget_Smart_Class; /** @@ -562,7 +562,7 @@ EAPI void _elm_access_widget_item_register(Elm_Widget_Item_Data *ite EAPI void _elm_access_widget_item_unregister(Elm_Widget_Item_Data *item); EAPI void _elm_access_on_highlight_hook_set(Elm_Access_Info *ac, Elm_Access_On_Highlight_Cb func, void *data); EAPI void _elm_access_activate_callback_set(Elm_Access_Info *ac, Elm_Access_Activate_Cb func, void *data); -EAPI void _elm_access_highlight_object_activate(Evas_Object *obj, Elm_Activate act); +EAPI void _elm_access_highlight_object_activate(Evas_Object *obj, Efl_Ui_Activate act); EAPI void _elm_access_highlight_cycle(Evas_Object *obj, Elm_Focus_Direction dir); EINA_DEPRECATED EAPI Elm_Access_Info *_elm_access_object_get(const Evas_Object *obj); @@ -719,7 +719,7 @@ EAPI Evas_Object *elm_widget_name_find(const Evas_Object *obj, const char *n EAPI Eina_List *elm_widget_stringlist_get(const char *str); EAPI void elm_widget_stringlist_free(Eina_List *list); EAPI void elm_widget_focus_mouse_up_handle(Evas_Object *obj); -EAPI void elm_widget_activate(Evas_Object *obj, Elm_Activate act); +EAPI void elm_widget_activate(Evas_Object *obj, Efl_Ui_Activate act); EAPI void elm_widget_part_text_set(Evas_Object *obj, const char *part, const char *label); EAPI const char *elm_widget_part_text_get(const Evas_Object *obj, const char *part); EAPI const char *elm_widget_translatable_part_text_get(const Evas_Object *obj, const char *part); --
