jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=116f24fd78b5ba8b07939ba6a007a5f77ea15dbc
commit 116f24fd78b5ba8b07939ba6a007a5f77ea15dbc Author: Jean-Philippe Andre <[email protected]> Date: Tue Dec 12 12:01:46 2017 +0900 elm: Rename struct to Efl.Ui.Widget.Focus_State Ref T5363 --- src/lib/elementary/efl_ui_focus_composition.c | 2 +- src/lib/elementary/efl_ui_focus_layer.c | 2 +- src/lib/elementary/elc_fileselector.c | 2 +- src/lib/elementary/elm_gengrid.c | 2 +- src/lib/elementary/elm_genlist.c | 2 +- src/lib/elementary/elm_scroller.c | 2 +- src/lib/elementary/elm_toolbar.c | 2 +- src/lib/elementary/elm_widget.c | 4 ++-- src/lib/elementary/elm_widget.eo | 6 +++--- src/lib/elementary/elm_widget.h | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/lib/elementary/efl_ui_focus_composition.c b/src/lib/elementary/efl_ui_focus_composition.c index dcd1c7b00d..2b2b381fd7 100644 --- a/src/lib/elementary/efl_ui_focus_composition.c +++ b/src/lib/elementary/efl_ui_focus_composition.c @@ -130,7 +130,7 @@ _efl_ui_focus_composition_composition_elements_get(Eo *obj EINA_UNUSED, Efl_Ui_F } EOLIAN static Eina_Bool -_efl_ui_focus_composition_elm_widget_focus_state_apply(Eo *obj, Efl_Ui_Focus_Composition_Data *pd, Elm_Widget_Focus_State current_state, Elm_Widget_Focus_State *configured_state, Elm_Widget *redirect) +_efl_ui_focus_composition_elm_widget_focus_state_apply(Eo *obj, Efl_Ui_Focus_Composition_Data *pd, Efl_Ui_Widget_Focus_State current_state, Efl_Ui_Widget_Focus_State *configured_state, Elm_Widget *redirect) { Eina_Bool registered; diff --git a/src/lib/elementary/efl_ui_focus_layer.c b/src/lib/elementary/efl_ui_focus_layer.c index adc1e62e53..456c6e9ece 100644 --- a/src/lib/elementary/efl_ui_focus_layer.c +++ b/src/lib/elementary/efl_ui_focus_layer.c @@ -65,7 +65,7 @@ _efl_ui_focus_layer_efl_ui_focus_user_focus_manager_get(Eo *obj, Efl_Ui_Focus_La } EOLIAN static Eina_Bool -_efl_ui_focus_layer_elm_widget_focus_state_apply(Eo *obj EINA_UNUSED, Efl_Ui_Focus_Layer_Data *pd EINA_UNUSED, Elm_Widget_Focus_State current_state EINA_UNUSED, Elm_Widget_Focus_State *configured_state EINA_UNUSED, Elm_Widget *redirect EINA_UNUSED) +_efl_ui_focus_layer_elm_widget_focus_state_apply(Eo *obj EINA_UNUSED, Efl_Ui_Focus_Layer_Data *pd EINA_UNUSED, Efl_Ui_Widget_Focus_State current_state EINA_UNUSED, Efl_Ui_Widget_Focus_State *configured_state EINA_UNUSED, Elm_Widget *redirect EINA_UNUSED) { return EINA_FALSE; } diff --git a/src/lib/elementary/elc_fileselector.c b/src/lib/elementary/elc_fileselector.c index 2cda6eeeef..bfb1c8503c 100644 --- a/src/lib/elementary/elc_fileselector.c +++ b/src/lib/elementary/elc_fileselector.c @@ -3067,7 +3067,7 @@ _elm_fileselector_elm_interface_fileselector_sort_method_get(Eo *obj EINA_UNUSED } EOLIAN static Eina_Bool -_elm_fileselector_elm_widget_focus_state_apply(Eo *obj, Elm_Fileselector_Data *pd, Elm_Widget_Focus_State current_state, Elm_Widget_Focus_State *configured_state, Elm_Widget *redirect) +_elm_fileselector_elm_widget_focus_state_apply(Eo *obj, Elm_Fileselector_Data *pd, Efl_Ui_Widget_Focus_State current_state, Efl_Ui_Widget_Focus_State *configured_state, Elm_Widget *redirect) { Eina_Bool ret = efl_ui_widget_focus_state_apply(efl_super(obj, MY_CLASS), current_state, configured_state, redirect); diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c index 4dd0308886..48b371da71 100644 --- a/src/lib/elementary/elm_gengrid.c +++ b/src/lib/elementary/elm_gengrid.c @@ -5722,7 +5722,7 @@ _elm_gengrid_efl_ui_focus_composition_prepare(Eo *obj, Elm_Gengrid_Data *pd) } EOLIAN static Eina_Bool -_elm_gengrid_elm_widget_focus_state_apply(Eo *obj, Elm_Gengrid_Data *pd EINA_UNUSED, Elm_Widget_Focus_State current_state, Elm_Widget_Focus_State *configured_state, Elm_Widget *redirect EINA_UNUSED) +_elm_gengrid_elm_widget_focus_state_apply(Eo *obj, Elm_Gengrid_Data *pd EINA_UNUSED, Efl_Ui_Widget_Focus_State current_state, Efl_Ui_Widget_Focus_State *configured_state, Elm_Widget *redirect EINA_UNUSED) { return efl_ui_widget_focus_state_apply(efl_super(obj, MY_CLASS), current_state, configured_state, obj); } diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c index 3d219e5359..664bee7558 100644 --- a/src/lib/elementary/elm_genlist.c +++ b/src/lib/elementary/elm_genlist.c @@ -8791,7 +8791,7 @@ _elm_genlist_item_efl_ui_focus_object_prepare_logical(Eo *obj, Elm_Gen_Item *pd) } EOLIAN static Eina_Bool -_elm_genlist_elm_widget_focus_state_apply(Eo *obj, Elm_Genlist_Data *pd EINA_UNUSED, Elm_Widget_Focus_State current_state, Elm_Widget_Focus_State *configured_state, Elm_Widget *redirect EINA_UNUSED) +_elm_genlist_elm_widget_focus_state_apply(Eo *obj, Elm_Genlist_Data *pd EINA_UNUSED, Efl_Ui_Widget_Focus_State current_state, Efl_Ui_Widget_Focus_State *configured_state, Elm_Widget *redirect EINA_UNUSED) { return efl_ui_widget_focus_state_apply(efl_super(obj, MY_CLASS), current_state, configured_state, obj); } diff --git a/src/lib/elementary/elm_scroller.c b/src/lib/elementary/elm_scroller.c index 593e1d530b..08b2dd17cb 100644 --- a/src/lib/elementary/elm_scroller.c +++ b/src/lib/elementary/elm_scroller.c @@ -1336,7 +1336,7 @@ _elm_scroller_class_constructor(Efl_Class *klass) } EOLIAN static Eina_Bool -_elm_scroller_elm_widget_focus_state_apply(Eo *obj, Elm_Scroller_Data *pd EINA_UNUSED, Elm_Widget_Focus_State current_state, Elm_Widget_Focus_State *configured_state, Elm_Widget *redirect EINA_UNUSED) +_elm_scroller_elm_widget_focus_state_apply(Eo *obj, Elm_Scroller_Data *pd EINA_UNUSED, Efl_Ui_Widget_Focus_State current_state, Efl_Ui_Widget_Focus_State *configured_state, Elm_Widget *redirect EINA_UNUSED) { //undepended from logical or not we always reigster as full with ourself as redirect configured_state->logical = EINA_TRUE; diff --git a/src/lib/elementary/elm_toolbar.c b/src/lib/elementary/elm_toolbar.c index 21def5ddc1..aa86ec8e06 100644 --- a/src/lib/elementary/elm_toolbar.c +++ b/src/lib/elementary/elm_toolbar.c @@ -2953,7 +2953,7 @@ elm_toolbar_add(Evas_Object *parent) } EOLIAN static Eina_Bool -_elm_toolbar_elm_widget_focus_state_apply(Eo *obj, Elm_Toolbar_Data *pd EINA_UNUSED, Elm_Widget_Focus_State current_state, Elm_Widget_Focus_State *configured_state, Elm_Widget *redirect EINA_UNUSED) +_elm_toolbar_elm_widget_focus_state_apply(Eo *obj, Elm_Toolbar_Data *pd EINA_UNUSED, Efl_Ui_Widget_Focus_State current_state, Efl_Ui_Widget_Focus_State *configured_state, Elm_Widget *redirect EINA_UNUSED) { configured_state->logical = EINA_TRUE; return efl_ui_widget_focus_state_apply(efl_super(obj, MY_CLASS), current_state, configured_state, obj); diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c index 317e631625..83437d604b 100644 --- a/src/lib/elementary/elm_widget.c +++ b/src/lib/elementary/elm_widget.c @@ -334,7 +334,7 @@ _focus_manager_eval(Eo *obj, Elm_Widget_Smart_Data *pd) } EOLIAN static Eina_Bool -_elm_widget_focus_state_apply(Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED, Elm_Widget_Focus_State current_state, Elm_Widget_Focus_State *configured_state, Elm_Widget *redirect) +_elm_widget_focus_state_apply(Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED, Efl_Ui_Widget_Focus_State current_state, Efl_Ui_Widget_Focus_State *configured_state, Elm_Widget *redirect) { Eina_Bool registered = EINA_TRUE; @@ -412,7 +412,7 @@ _eval_registration_candidate(Eo *obj, Elm_Widget_Smart_Data *pd, Eina_Bool *shou static void _focus_state_eval(Eo *obj, Elm_Widget_Smart_Data *pd, Eina_Bool should, Eina_Bool want_full) { - Elm_Widget_Focus_State configuration; + Efl_Ui_Widget_Focus_State configuration; //this would mean we are registering again the root, we dont want that if (pd->manager.manager == obj) return; diff --git a/src/lib/elementary/elm_widget.eo b/src/lib/elementary/elm_widget.eo index c8eca7aa78..b6a4b916b5 100644 --- a/src/lib/elementary/elm_widget.eo +++ b/src/lib/elementary/elm_widget.eo @@ -6,7 +6,7 @@ function Efl.Ui.Scrollable_On_Show_Region { } }; -struct Elm.Widget.Focus_State { +struct Efl.Ui.Widget.Focus_State { [[All relevant fields needed for the current state of focus registeration]] manager : Efl.Ui.Focus.Manager; [[The manager where the widget is registered in]] parent : Efl.Ui.Focus.User; [[The parent the widget is using as logical parent]] @@ -549,9 +549,9 @@ abstract Elm.Widget (Efl.Canvas.Group, Efl.Access, not registered. ]] params { - @in current_state : Elm.Widget.Focus_State; + @in current_state : Efl.Ui.Widget.Focus_State; [[The focus manager to register with.]] - @inout configured_state : Elm.Widget.Focus_State; + @inout configured_state : Efl.Ui.Widget.Focus_State; [[The evalulated Focus state that should be used.]] @in redirect : Elm.Widget; [[A redirect that will be set by the elm.widget implementation.]] diff --git a/src/lib/elementary/elm_widget.h b/src/lib/elementary/elm_widget.h index 9fb43906a8..23e1a5ec4c 100644 --- a/src/lib/elementary/elm_widget.h +++ b/src/lib/elementary/elm_widget.h @@ -432,7 +432,7 @@ typedef struct _Elm_Widget_Smart_Data Elm_Focus_Move_Policy focus_move_policy; Elm_Focus_Region_Show_Mode focus_region_show_mode; - Elm_Widget_Focus_State focus; + Efl_Ui_Widget_Focus_State focus; struct { int child_count; Efl_Ui_Focus_Object *parent; --
