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

efl_ui_focus_composition: remove unneeded API 

the purpose of this API can be improved, and the values there can be
guessed.

Reviewed-by: Xavi Artigas <xavierartigas@yahoo.es>
Differential Revision: https://phab.enlightenment.org/D7993
This commit is contained in:
Marcel Hollerbach 2019-02-17 18:22:13 +01:00
parent 46ce95f43f
commit b9f82ccac3
5 changed files with 8 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/lib/elementary/efl_ui_focus_composition.c
View File

@ -14,7 +14,7 @@
typedef struct {
Eina_List *order, *targets_ordered;
Eina_List *register_target, *registered_targets;
Efl_Ui_Focus_Manager *registered, *custom_manager, *old_manager;
Efl_Ui_Focus_Manager *registered, *old_manager;
Eina_Bool dirty;
Eina_Bool logical;
} Efl_Ui_Focus_Composition_Data;
@ -27,10 +27,7 @@ _state_apply(Eo *obj, Efl_Ui_Focus_Composition_Data *pd)
//Legacy code compatibility, only update the custom chain of elements if legacy was NOT messing with it.
if (elm_widget_is_legacy(obj) && elm_object_focus_custom_chain_get(obj)) return;
if (pd->custom_manager)
manager = pd->custom_manager;
else
manager = pd->registered;
manager = pd->registered;
if (manager)
{
@ -167,7 +164,12 @@ _efl_ui_focus_composition_efl_ui_widget_focus_state_apply(Eo *obj, Efl_Ui_Focus_
registered = efl_ui_widget_focus_state_apply(efl_super(obj, MY_CLASS), current_state, configured_state, redirect);
if (registered)
pd->registered = configured_state->manager;
{
if (efl_isa(obj, EFL_UI_FOCUS_MANAGER_INTERFACE))
pd->registered = obj;
else
pd->registered = configured_state->manager;
}
else
pd->registered = NULL;
@ -194,18 +196,6 @@ _efl_ui_focus_composition_efl_ui_focus_object_prepare_logical_none_recursive(Eo
efl_ui_focus_object_prepare_logical_none_recursive(efl_super(obj, MY_CLASS));
}
EOLIAN static void
_efl_ui_focus_composition_custom_manager_set(Eo *obj EINA_UNUSED, Efl_Ui_Focus_Composition_Data *pd, Efl_Ui_Focus_Manager *custom_manager)
{
pd->custom_manager = custom_manager;
}
EOLIAN static Efl_Ui_Focus_Manager*
_efl_ui_focus_composition_custom_manager_get(const Eo *obj EINA_UNUSED, Efl_Ui_Focus_Composition_Data *pd)
{
return pd->custom_manager;
}
EOLIAN static void
_efl_ui_focus_composition_logical_mode_set(Eo *obj EINA_UNUSED, Efl_Ui_Focus_Composition_Data *pd, Eina_Bool logical_mode)
{

9
src/lib/elementary/efl_ui_focus_composition.eo
View File

@ -29,15 +29,6 @@ mixin @beta Efl.Ui.Focus.Composition requires Efl.Ui.Widget {
You can use this function to call composition_elements.
]]
}
@property custom_manager @protected {
[[Register all children in this manager
Set to $null to register them in the same manager as the implementor is
]]
values {
custom_manager : Efl.Ui.Focus.Manager; [[EFL focus manager]]
}
}
@property logical_mode @protected {
[[Set to true if all children should be registered as logicals]]
values {

1
src/lib/elementary/efl_ui_list_view.c
View File

@ -680,7 +680,6 @@ _efl_ui_list_view_efl_object_constructor(Eo *obj, Efl_Ui_List_View_Data *pd)
efl_event_callback_add(obj, EFL_UI_FOCUS_MANAGER_EVENT_MANAGER_FOCUS_CHANGED, _list_element_focused, NULL);
efl_ui_focus_composition_custom_manager_set(obj, obj);
efl_ui_focus_composition_logical_mode_set(obj, EINA_TRUE);
pd->style = eina_stringshare_add(elm_widget_style_get(obj));

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

@ -4354,7 +4354,6 @@ _elm_gengrid_efl_object_constructor(Eo *obj, Elm_Gengrid_Data *sd)
efl_ui_focus_parent_provider_gen_container_set(efl_added, obj),
efl_ui_focus_parent_provider_gen_content_item_map_set(efl_added, sd->content_item_map));
efl_ui_focus_composition_custom_manager_set(obj, obj);
efl_ui_focus_composition_logical_mode_set(obj, EINA_TRUE);
obj = efl_constructor(efl_super(obj, MY_CLASS));

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

@ -2986,8 +2986,6 @@ _elm_toolbar_efl_object_constructor(Eo *obj, Elm_Toolbar_Data *_pd EINA_UNUSED)
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
efl_access_object_role_set(obj, EFL_ACCESS_ROLE_TOOL_BAR);
efl_ui_focus_composition_custom_manager_set(obj, obj);
return obj;
}