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

efl_ui_focus_user/object: fix api duplication 

just like the commit before, this fixes duplicated api names
This commit is contained in:
Marcel Hollerbach 2017-12-03 16:47:26 +01:00
parent baf624680d
commit 78afa2fb84
20 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,7 +59,7 @@ _efl_ui_focus_layer_efl_object_destructor(Eo *obj, Efl_Ui_Focus_Layer_Data *pd E
}
EOLIAN static Efl_Ui_Focus_Manager*
_efl_ui_focus_layer_efl_ui_focus_user_manager_get(Eo *obj, Efl_Ui_Focus_Layer_Data *pd EINA_UNUSED)
_efl_ui_focus_layer_efl_ui_focus_user_focus_manager_get(Eo *obj, Efl_Ui_Focus_Layer_Data *pd EINA_UNUSED)
{
return elm_widget_top_get(obj);
}

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

@ -24,7 +24,7 @@ mixin Efl.Ui.Focus.Layer (Efl.Interface, Elm.Widget, Efl.Gfx, Efl.Ui.Focus.Manag
Elm.Widget.focus_state_apply;
Efl.Gfx.visible {set;}
Efl.Ui.Focus.Manager.move;
Efl.Ui.Focus.User.manager { get; }
Efl.Ui.Focus.User.focus_manager { get; }
Efl.Object.constructor;
Efl.Object.destructor;
}

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

@ -83,12 +83,12 @@ _manager_in_chain_set(Eo *obj, Efl_Ui_Focus_Manager_Calc_Data *pd)
EINA_SAFETY_ON_NULL_RETURN(pd->root);
if (!efl_isa(pd->root->focusable, EFL_UI_WIN_CLASS))
EINA_SAFETY_ON_NULL_RETURN(efl_ui_focus_user_manager_get(pd->root->focusable));
EINA_SAFETY_ON_NULL_RETURN(efl_ui_focus_user_focus_manager_get(pd->root->focusable));
//so we dont run infinitly this does not fix it, but at least we only have a error
EINA_SAFETY_ON_TRUE_RETURN(efl_ui_focus_user_manager_get(pd->root->focusable) == obj);
EINA_SAFETY_ON_TRUE_RETURN(efl_ui_focus_user_focus_manager_get(pd->root->focusable) == obj);
efl_ui_focus_manager_focus_set(efl_ui_focus_user_manager_get(pd->root->focusable), pd->root->focusable);
efl_ui_focus_manager_focus_set(efl_ui_focus_user_focus_manager_get(pd->root->focusable), pd->root->focusable);
}
static Efl_Ui_Focus_Direction

10
src/lib/elementary/efl_ui_focus_manager_sub.c
View File

@ -49,7 +49,7 @@ _border_flush(Eo *obj, Efl_Ui_Focus_Manager_Sub_Data *pd)
Efl_Ui_Focus_Object *node, *logical;
Efl_Ui_Focus_Manager *manager;
manager = efl_ui_focus_user_manager_get(obj);
manager = efl_ui_focus_user_focus_manager_get(obj);
logical = obj;
borders = efl_ui_focus_manager_border_elements_get(obj);
@ -90,7 +90,7 @@ _border_unregister(Eo *obj, Efl_Ui_Focus_Manager_Sub_Data *pd)
Efl_Ui_Focus_Object *node;
Efl_Ui_Focus_Manager *manager;
manager = efl_ui_focus_user_manager_get(obj);
manager = efl_ui_focus_user_focus_manager_get(obj);
EINA_LIST_FREE(pd->current_border, node)
{
if (node == obj) continue;
@ -137,7 +137,7 @@ _logical_manager_change(void *data EINA_UNUSED, const Efl_Event *ev)
Eina_List *n;
Efl_Ui_Focus_User *b;
Efl_Ui_Focus_Manager *manager;
manager = efl_ui_focus_user_manager_get(ev->object);
manager = efl_ui_focus_user_focus_manager_get(ev->object);
if (!ev->info) return;
@ -157,8 +157,8 @@ _flush_manager(Eo *obj, Efl_Ui_Focus_Manager_Sub_Data *pd)
Eina_List *n;
logical = efl_ui_focus_user_parent_get(obj);
manager = efl_ui_focus_user_manager_get(obj);
logical = efl_ui_focus_user_focus_parent_get(obj);
manager = efl_ui_focus_user_focus_manager_get(obj);
//unregister from the old
efl_event_callback_array_del(pd->manager, parent_manager(), obj);

4
src/lib/elementary/efl_ui_focus_user.eo
View File

@ -4,7 +4,7 @@ interface Efl.Ui.Focus.User {
@since 1.20
]]
methods {
@property manager {
@property focus_manager {
[[Describes which manager is used to register.
If a instance of this interface is the root of a manager this instance should not have the manager where it is root as this property. This other manager then this instance will be set as focused in the other manager.
@ -15,7 +15,7 @@ interface Efl.Ui.Focus.User {
manager : Efl.Ui.Focus.Manager; [[The manager object]]
}
}
@property parent {
@property focus_parent {
[[Describes which logical parent is used by this object.]]
get {}
values {

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

@ -20,7 +20,7 @@ _efl_ui_focus_util_focus(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, Efl_Ui_Focus
{
Elm_Widget *top, *o;
Efl_Ui_Focus_Manager *m;
m = efl_ui_focus_user_manager_get(user);
m = efl_ui_focus_user_focus_manager_get(user);
top = elm_widget_top_get(user);

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

@ -1688,7 +1688,7 @@ static void
_legacy_manager_changed_cb(void *data EINA_UNUSED, const Efl_Event *ev)
{
efl_event_callback_del(ev->info, EFL_UI_FOCUS_MANAGER_EVENT_FOCUSED, _legacy_focused, ev->object);
efl_event_callback_add(efl_ui_focus_user_manager_get(ev->object), EFL_UI_FOCUS_MANAGER_EVENT_FOCUSED, _legacy_focused, ev->object);
efl_event_callback_add(efl_ui_focus_user_focus_manager_get(ev->object), EFL_UI_FOCUS_MANAGER_EVENT_FOCUSED, _legacy_focused, ev->object);
}
EOLIAN static Eo *

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

@ -385,7 +385,7 @@ _toggle_entry(Evas_Object *obj)
efl_ui_focus_composition_elements_set(obj, items);
}
efl_ui_focus_manager_focus_set(efl_ui_focus_user_manager_get(obj), sd->ent);
efl_ui_focus_manager_focus_set(efl_ui_focus_user_focus_manager_get(obj), sd->ent);
}
}
@ -404,7 +404,7 @@ _spin_value(void *data)
Efl_Ui_Spin_Button_Data *sd = efl_data_scope_get(data, MY_CLASS);
Efl_Ui_Spin_Data *pd = efl_data_scope_get(data, EFL_UI_SPIN_CLASS);
if (_value_set(data, pd->val + (sd->inc_val ? pd->step : -pd->step)))
if (_value_set(data, pd->val + (sd->inc_val ? pd->step : -pd->step)))
_label_write(data);
return ECORE_CALLBACK_RENEW;

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

@ -117,7 +117,7 @@ _focus_chain_update(Eo *obj, Elm_Fileselector_Data *pd)
#undef A
efl_ui_focus_manager_calc_update_order(efl_ui_focus_user_manager_get(obj), obj, tmp);
efl_ui_focus_manager_calc_update_order(efl_ui_focus_user_focus_manager_get(obj), obj, tmp);
}
static void

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

@ -92,7 +92,7 @@ _prev_page_focus_recover(Elm_Naviframe_Item_Data *it)
{
Elm_Naviframe *n = it->base->widget;
efl_ui_focus_manager_focus_set(efl_ui_focus_user_manager_get(n), n);
efl_ui_focus_manager_focus_set(efl_ui_focus_user_focus_manager_get(n), n);
}
EOLIAN static void

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

@ -537,7 +537,7 @@ _access_highlight_next_get(Evas_Object *obj, Elm_Focus_Direction dir)
{
Efl_Ui_Focus_Relations *rel;
rel = efl_ui_focus_manager_fetch(efl_ui_focus_user_manager_get(obj), obj);
rel = efl_ui_focus_manager_fetch(efl_ui_focus_user_focus_manager_get(obj), obj);
if (rel)
{

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

@ -664,7 +664,7 @@ _elm_hover_efl_gfx_visible_set(Eo *obj, Elm_Hover_Data *pd, Eina_Bool vis)
{
_hov_show_do(obj);
//we just set ourself as redirect in the next upper manager
pd->redirected = efl_ui_focus_user_manager_get(pd->target);
pd->redirected = efl_ui_focus_user_focus_manager_get(pd->target);
efl_ui_focus_manager_redirect_set(pd->redirected, obj);
}
else

14
src/lib/elementary/elm_main.c
View File

@ -578,7 +578,7 @@ EAPI void
elm_app_base_scale_set(double base_scale)
{
if (base_scale < 0.0) return;
if (fabs(base_scale) < DBL_EPSILON) return;
if (fabs(base_scale) < DBL_EPSILON) return;
app_base_scale = base_scale;
}
@ -1589,13 +1589,13 @@ elm_object_focus_get(const Evas_Object *obj)
if (!elm_widget_is(obj))
return evas_object_focus_get(obj);
m = efl_ui_focus_user_manager_get(obj);
m = efl_ui_focus_user_focus_manager_get(obj);
//no manager means not registered
if (!m) return EINA_FALSE;
//assertion: our redirect manager m is in the redirect chain
m = efl_ui_focus_user_manager_get(obj);
m = efl_ui_focus_user_focus_manager_get(obj);
//if obj is the redriect manager its kind of focused
if (efl_ui_focus_manager_redirect_get(m) == obj) return EINA_TRUE;
@ -1610,7 +1610,7 @@ elm_object_focus_get(const Evas_Object *obj)
{
if (focused_child == obj) return EINA_TRUE;
focused_child = efl_ui_focus_user_parent_get(focused_child);
focused_child = efl_ui_focus_user_focus_parent_get(focused_child);
}
return efl_ui_focus_object_focus_get(obj);
@ -1638,8 +1638,8 @@ elm_object_focus_set(Evas_Object *obj,
efl_ui_focus_util_focus(EFL_UI_FOCUS_UTIL_CLASS, obj);
else
{
if (efl_ui_focus_manager_focus_get(efl_ui_focus_user_manager_get(obj)) == obj)
efl_ui_focus_manager_pop_history_stack(efl_ui_focus_user_manager_get(obj));
if (efl_ui_focus_manager_focus_get(efl_ui_focus_user_focus_manager_get(obj)) == obj)
efl_ui_focus_manager_pop_history_stack(efl_ui_focus_user_focus_manager_get(obj));
}
}
else
@ -2080,4 +2080,4 @@ EAPI Elm_Focus_Region_Show_Mode
elm_object_focus_region_show_mode_get(const Evas_Object *obj)
{
return elm_widget_focus_region_show_mode_get(obj);
}
}

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

@ -660,7 +660,7 @@ _toggle_entry(Evas_Object *obj)
efl_ui_focus_composition_elements_set(obj, items);
}
efl_ui_focus_manager_focus_set(efl_ui_focus_user_manager_get(obj), sd->ent);
efl_ui_focus_manager_focus_set(efl_ui_focus_user_focus_manager_get(obj), sd->ent);
}
}

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

@ -312,7 +312,7 @@ _focus_manager_eval(Eo *obj, Elm_Widget_Smart_Data *pd)
}
else
{
new = efl_ui_focus_user_manager_get(parent);
new = efl_ui_focus_user_focus_manager_get(parent);
provider = parent;
}
@ -5355,13 +5355,13 @@ _elm_widget_efl_object_provider_find(Eo *obj, Elm_Widget_Smart_Data *pd, const E
}
EOLIAN static Efl_Ui_Focus_Manager*
_elm_widget_efl_ui_focus_user_parent_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd EINA_UNUSED)
_elm_widget_efl_ui_focus_user_focus_parent_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd EINA_UNUSED)
{
return pd->focus.parent;
}
EOLIAN static Efl_Ui_Focus_Manager*
_elm_widget_efl_ui_focus_user_manager_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd EINA_UNUSED)
_elm_widget_efl_ui_focus_user_focus_manager_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd EINA_UNUSED)
{
return pd->focus.manager;
}

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

@ -618,8 +618,8 @@ abstract Elm.Widget (Efl.Canvas.Group, Efl.Access,
Efl.Access.parent { get; }
Efl.Access.attributes { get; }
Efl.Access.Component.focus_grab;
Efl.Ui.Focus.User.manager { get; }
Efl.Ui.Focus.User.parent { get; }
Efl.Ui.Focus.User.focus_manager { get; }
Efl.Ui.Focus.User.focus_parent { get; }
Efl.Ui.Focus.Object.focus_geometry { get; }
Efl.Ui.Focus.Object.focus { set; }
Efl.Ui.Base.mirrored { get; set; }

4
src/tests/elementary/elm_test_focus_common.c
View File

@ -101,13 +101,13 @@ _focus_test_efl_gfx_geometry_get(Eo *obj EINA_UNUSED, Focus_Test_Data *pd)
}
EOLIAN static Efl_Ui_Focus_Manager*
_focus_test_efl_ui_focus_user_manager_get(Eo *obj EINA_UNUSED, Focus_Test_Data *pd)
_focus_test_efl_ui_focus_user_focus_manager_get(Eo *obj EINA_UNUSED, Focus_Test_Data *pd)
{
return pd->manager;
}
EOLIAN static Efl_Ui_Focus_Object*
_focus_test_efl_ui_focus_user_parent_get(Eo *obj, Focus_Test_Data *pd EINA_UNUSED)
_focus_test_efl_ui_focus_user_focus_parent_get(Eo *obj, Focus_Test_Data *pd EINA_UNUSED)
{
return efl_parent_get(obj);
}

4
src/tests/elementary/elm_test_focus_sub.c
View File

@ -13,13 +13,13 @@ _focus_test_sub_main_efl_ui_focus_object_focus_geometry_get(Eo *obj EINA_UNUSED,
}
EOLIAN static Efl_Ui_Focus_Manager*
_focus_test_sub_main_efl_ui_focus_user_manager_get(Eo *obj, Focus_Test_Sub_Main_Data *pd EINA_UNUSED)
_focus_test_sub_main_efl_ui_focus_user_focus_manager_get(Eo *obj, Focus_Test_Sub_Main_Data *pd EINA_UNUSED)
{
return efl_key_data_get(obj, "__user_manager");
}
EOLIAN static Efl_Ui_Focus_Object*
_focus_test_sub_main_efl_ui_focus_user_parent_get(Eo *obj, Focus_Test_Sub_Main_Data *pd EINA_UNUSED)
_focus_test_sub_main_efl_ui_focus_user_focus_parent_get(Eo *obj, Focus_Test_Sub_Main_Data *pd EINA_UNUSED)
{
return efl_key_data_get(obj, "__user_parent");
}

4
src/tests/elementary/focus_test.eo
View File

@ -18,8 +18,8 @@ class Focus.Test(Efl.Object, Efl.Ui.Focus.Object, Efl.Ui.Focus.User, Efl.Gfx) {
Efl.Object.constructor;
Efl.Ui.Focus.Object.focus_geometry { get; }
Efl.Ui.Focus.Object.focus { set; }
Efl.Ui.Focus.User.manager { get; }
Efl.Ui.Focus.User.parent {get; }
Efl.Ui.Focus.User.focus_manager { get; }
Efl.Ui.Focus.User.focus_parent {get; }
Efl.Gfx.geometry { get; }
}
}

4
src/tests/elementary/focus_test_sub_main.eo
View File

@ -1,7 +1,7 @@
class Focus.Test.Sub.Main(Efl.Object, Efl.Ui.Focus.User, Efl.Ui.Focus.Object, Efl.Ui.Focus.Manager.Sub) {
implements {
Efl.Ui.Focus.User.manager { get; }
Efl.Ui.Focus.User.parent { get; }
Efl.Ui.Focus.User.focus_manager { get; }
Efl.Ui.Focus.User.focus_parent { get; }
Efl.Ui.Focus.Object.focus_geometry { get; }
}
}