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

elm: Rename Elm.Activate to Efl.Ui.Activate 

Note: This is an EO-only beta API.

Ref T5329
This commit is contained in:
Jean-Philippe Andre 2017-10-16 13:33:52 +09:00
parent 85d4a618a7
commit c9c9e6a209
13 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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

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

@ -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);

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

@ -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);

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

@ -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);

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

@ -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);

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

@ -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);
}
}
}

24
src/lib/elementary/elm_access.c
View File

@ -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:

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

@ -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);

2
src/lib/elementary/elm_general.eot
View File

@ -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]]

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

@ -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;

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

@ -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)));

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

@ -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 */

6
src/lib/elementary/elm_widget.h
View File

@ -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);