timer23
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

widget: Rename focus_manager_factory to create 

factory is not a verb :)

Ref T5363
This commit is contained in:
Jean-Philippe Andre 2017-09-13 11:33:08 +09:00
parent 3c386e5fdf
commit 6d0957b0a5
12 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5340,7 +5340,7 @@ _efl_ui_win_efl_canvas_object_legacy_ctor(Eo *obj, Efl_Ui_Win_Data *sd)
}
EOLIAN static Efl_Ui_Focus_Manager*
_efl_ui_win_elm_widget_focus_manager_factory(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *pd EINA_UNUSED, Efl_Ui_Focus_Object *root)
_efl_ui_win_elm_widget_focus_manager_create(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *pd EINA_UNUSED, Efl_Ui_Focus_Object *root)
{
Efl_Ui_Focus_Manager *manager;
@ -5372,7 +5372,7 @@ _efl_ui_win_efl_object_constructor(Eo *obj, Efl_Ui_Win_Data *pd)
* really bad and hacky. Needs fixing. */
pd->obj = obj;
pd->manager = elm_obj_widget_focus_manager_factory(obj, obj);
pd->manager = elm_obj_widget_focus_manager_create(obj, obj);
pd->profile.available = eina_array_new(4);
efl_composite_attach(obj, pd->manager);

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

@ -833,7 +833,7 @@ class Efl.Ui.Win (Elm.Widget, Efl.Canvas, Efl.Access.Window,
Elm.Widget.focus_highlight_animate { get; set; }
Elm.Widget.on_focus_update;
Elm.Widget.widget_event;
Elm.Widget.focus_manager_factory;
Elm.Widget.focus_manager_create;
Elm.Interface.Atspi_Accessible.parent { get; }
Elm.Interface.Atspi_Accessible.state_set { get; }
Elm.Interface.Atspi_Accessible.name { get; }

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

@ -699,7 +699,7 @@ elm_hover_add(Evas_Object *parent)
}
EOLIAN static Efl_Ui_Focus_Manager*
_elm_hover_elm_widget_focus_manager_factory(Eo *obj EINA_UNUSED, Elm_Hover_Data *pd EINA_UNUSED, Efl_Ui_Focus_Object *root)
_elm_hover_elm_widget_focus_manager_create(Eo *obj EINA_UNUSED, Elm_Hover_Data *pd EINA_UNUSED, Efl_Ui_Focus_Object *root)
{
Efl_Ui_Focus_Manager *manager;
@ -718,7 +718,7 @@ _elm_hover_efl_object_constructor(Eo *obj, Elm_Hover_Data *pd)
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_POPUP_MENU);
pd->manager = elm_obj_widget_focus_manager_factory(obj, obj);
pd->manager = elm_obj_widget_focus_manager_create(obj, obj);
efl_composite_attach(obj, pd->manager);

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

@ -70,7 +70,7 @@ class Elm.Hover (Efl.Ui.Layout, Efl.Ui.Clickable, Elm.Interface.Atspi_Widget_Act
Elm.Widget.focus_direction_manager_is;
Elm.Widget.focus_next_manager_is;
Elm.Widget.widget_sub_object_del;
Elm.Widget.focus_manager_factory;
Elm.Widget.focus_manager_create;
Elm.Interface.Atspi_Widget_Action.elm_actions { get; }
Efl.Part.part;
}

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

@ -4679,7 +4679,7 @@ _focused_element(void *data, const Efl_Event *event)
}
EOLIAN static Efl_Ui_Focus_Manager*
_elm_interface_scrollable_elm_widget_focus_manager_factory(Eo *obj EINA_UNUSED, Elm_Scrollable_Smart_Interface_Data *pd EINA_UNUSED, Efl_Ui_Focus_Object *root)
_elm_interface_scrollable_elm_widget_focus_manager_create(Eo *obj EINA_UNUSED, Elm_Scrollable_Smart_Interface_Data *pd EINA_UNUSED, Efl_Ui_Focus_Object *root)
{
Efl_Ui_Focus_Manager *manager;
@ -4693,7 +4693,7 @@ _elm_interface_scrollable_elm_widget_focus_manager_factory(Eo *obj EINA_UNUSED,
EOLIAN static Efl_Object*
_elm_interface_scrollable_efl_object_constructor(Eo *obj, Elm_Scrollable_Smart_Interface_Data *pd EINA_UNUSED)
{
pd->manager = elm_obj_widget_focus_manager_factory(obj, obj);
pd->manager = elm_obj_widget_focus_manager_create(obj, obj);
efl_composite_attach(obj, pd->manager);

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

@ -670,7 +670,7 @@ mixin Elm.Interface_Scrollable(Efl.Ui.Scrollable, Efl.Ui.Focus.Manager.Sub, Elm.
Efl.Object.constructor;
Efl.Ui.Focus.Manager.border_elements { get; }
Efl.Ui.Focus.Manager.focus {set; }
Elm.Widget.focus_manager_factory;
Elm.Widget.focus_manager_create;
}
events {
changed; [[Called when content changed]]

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

@ -104,7 +104,7 @@ elm_win_inwin_add(Evas_Object *parent)
EOLIAN static Efl_Ui_Focus_Manager*
_elm_inwin_elm_widget_focus_manager_factory(Eo *obj EINA_UNUSED, Elm_Inwin_Data *pd EINA_UNUSED, Efl_Ui_Focus_Object *root)
_elm_inwin_elm_widget_focus_manager_create(Eo *obj EINA_UNUSED, Elm_Inwin_Data *pd EINA_UNUSED, Efl_Ui_Focus_Object *root)
{
Efl_Ui_Focus_Manager *manager;
@ -133,7 +133,7 @@ _elm_inwin_efl_object_constructor(Eo *obj, Elm_Inwin_Data *pd EINA_UNUSED)
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_GLASS_PANE);
pd->manager = elm_obj_widget_focus_manager_factory(obj, obj);
pd->manager = elm_obj_widget_focus_manager_create(obj, obj);
efl_composite_attach(obj, pd->manager);

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

@ -24,7 +24,7 @@ class Elm.Inwin (Efl.Ui.Layout, Efl.Ui.Focus.Manager)
Elm.Widget.widget_parent { set; }
Elm.Widget.focus_next_manager_is;
Elm.Widget.focus_next;
Elm.Widget.focus_manager_factory;
Elm.Widget.focus_manager_create;
Efl.Gfx.visible { set; }
Efl.Ui.Focus.Manager.move;
}

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

@ -800,7 +800,7 @@ elm_menu_add(Evas_Object *parent)
}
EOLIAN static Efl_Ui_Focus_Manager*
_elm_menu_elm_widget_focus_manager_factory(Eo *obj EINA_UNUSED, Elm_Menu_Data *pd EINA_UNUSED, Efl_Ui_Focus_Object *root)
_elm_menu_elm_widget_focus_manager_create(Eo *obj EINA_UNUSED, Elm_Menu_Data *pd EINA_UNUSED, Efl_Ui_Focus_Object *root)
{
Efl_Ui_Focus_Manager *manager;
@ -817,7 +817,7 @@ _elm_menu_efl_object_constructor(Eo *obj, Elm_Menu_Data *sd)
Eo *parent = NULL;
Efl_Ui_Focus_Manager *manager;
manager = elm_obj_widget_focus_manager_factory(obj, obj);
manager = elm_obj_widget_focus_manager_create(obj, obj);
efl_composite_attach(obj, manager);
_efl_ui_focus_manager_redirect_events_add(manager, obj);

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

@ -60,7 +60,7 @@ class Elm.Menu (Elm.Widget, Efl.Ui.Clickable, Efl.Ui.Menu,
Elm.Widget.widget_parent { get; set; }
Elm.Widget.theme_apply;
Elm.Widget.translate;
Elm.Widget.focus_manager_factory;
Elm.Widget.focus_manager_create;
Elm.Interface.Atspi_Accessible.children { get; }
Elm.Interface.Atspi.Selection.selected_children_count { get; }
Elm.Interface.Atspi.Selection.selected_child { get; }

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

@ -6531,7 +6531,7 @@ _elm_widget_efl_ui_focus_object_focus_set(Eo *obj, Elm_Widget_Smart_Data *pd, Ei
}
EOLIAN static Efl_Ui_Focus_Manager*
_elm_widget_focus_manager_factory(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd EINA_UNUSED, Efl_Ui_Focus_Object *root EINA_UNUSED)
_elm_widget_focus_manager_create(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd EINA_UNUSED, Efl_Ui_Focus_Object *root EINA_UNUSED)
{
ERR("No manager presented");
return NULL;

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

@ -817,7 +817,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible,
}
return: bool; [[return $true or $false if the widget is registered or false if it is not]]
}
focus_manager_factory @protected {
focus_manager_create @protected {
[[If the widget needs a focus manager, this function will be called.
It can be used and overriden to inject your own manager or set