discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=f45e972c8cf7141c030d8d31473fcd360f8450a4
commit f45e972c8cf7141c030d8d31473fcd360f8450a4 Author: Mike Blumenkrantz <[email protected]> Date: Wed Feb 14 21:14:52 2018 -0500 Elm.Widget.Item: focus -> item_focus --- src/lib/elementary/efl_ui_widget.c | 4 ++-- src/lib/elementary/elc_ctxpopup.c | 4 ++-- src/lib/elementary/elc_hoversel.c | 4 ++-- src/lib/elementary/elm_color_item.eo | 2 +- src/lib/elementary/elm_colorselector.c | 4 ++-- src/lib/elementary/elm_ctxpopup_item.eo | 2 +- src/lib/elementary/elm_gengrid.c | 4 ++-- src/lib/elementary/elm_gengrid_item.eo | 2 +- src/lib/elementary/elm_genlist.c | 4 ++-- src/lib/elementary/elm_genlist_item.eo | 2 +- src/lib/elementary/elm_hoversel_item.eo | 2 +- src/lib/elementary/elm_list.c | 4 ++-- src/lib/elementary/elm_list_item.eo | 2 +- src/lib/elementary/elm_toolbar.c | 4 ++-- src/lib/elementary/elm_toolbar_item.eo | 2 +- src/lib/elementary/elm_widget_item.eo | 4 +++- 16 files changed, 26 insertions(+), 24 deletions(-) diff --git a/src/lib/elementary/efl_ui_widget.c b/src/lib/elementary/efl_ui_widget.c index a2c4614540..ba843610f3 100644 --- a/src/lib/elementary/efl_ui_widget.c +++ b/src/lib/elementary/efl_ui_widget.c @@ -4253,13 +4253,13 @@ _elm_widget_item_disable(Eo *eo_item EINA_UNUSED, Elm_Widget_Item_Data *item EIN } EOLIAN static void -_elm_widget_item_focus_set(Eo *eo_item EINA_UNUSED, Elm_Widget_Item_Data *item, Eina_Bool focused EINA_UNUSED) +_elm_widget_item_item_focus_set(Eo *eo_item EINA_UNUSED, Elm_Widget_Item_Data *item, Eina_Bool focused EINA_UNUSED) { ERR_NOT_SUPPORTED(item, "elm_object_item_focus_set"); } EOLIAN static Eina_Bool -_elm_widget_item_focus_get(Eo *eo_item EINA_UNUSED, Elm_Widget_Item_Data *item) +_elm_widget_item_item_focus_get(Eo *eo_item EINA_UNUSED, Elm_Widget_Item_Data *item) { ERR_NOT_SUPPORTED(item, "elm_object_item_focus_get"); return EINA_FALSE; diff --git a/src/lib/elementary/elc_ctxpopup.c b/src/lib/elementary/elc_ctxpopup.c index 35789d8fa2..fe0bf9ef24 100644 --- a/src/lib/elementary/elc_ctxpopup.c +++ b/src/lib/elementary/elc_ctxpopup.c @@ -884,7 +884,7 @@ _elm_ctxpopup_item_elm_widget_item_signal_emit(Eo *eo_ctxpopup_it EINA_UNUSED, } EOLIAN static void -_elm_ctxpopup_item_elm_widget_item_focus_set(Eo *eo_ctxpopup_it EINA_UNUSED, +_elm_ctxpopup_item_elm_widget_item_item_focus_set(Eo *eo_ctxpopup_it EINA_UNUSED, Elm_Ctxpopup_Item_Data *ctxpopup_it, Eina_Bool focused) { @@ -892,7 +892,7 @@ _elm_ctxpopup_item_elm_widget_item_focus_set(Eo *eo_ctxpopup_it EINA_UNUSED, } EOLIAN static Eina_Bool -_elm_ctxpopup_item_elm_widget_item_focus_get(Eo *eo_ctxpopup_it EINA_UNUSED, +_elm_ctxpopup_item_elm_widget_item_item_focus_get(Eo *eo_ctxpopup_it EINA_UNUSED, Elm_Ctxpopup_Item_Data *ctxpopup_it) { return elm_object_item_focus_get(ctxpopup_it->list_item); diff --git a/src/lib/elementary/elc_hoversel.c b/src/lib/elementary/elc_hoversel.c index a922be558f..da75ac89ca 100644 --- a/src/lib/elementary/elc_hoversel.c +++ b/src/lib/elementary/elc_hoversel.c @@ -572,7 +572,7 @@ _elm_hoversel_item_elm_widget_item_style_get(Eo *eo_it EINA_UNUSED, } EOLIAN static void -_elm_hoversel_item_elm_widget_item_focus_set(Eo *eo_it EINA_UNUSED, +_elm_hoversel_item_elm_widget_item_item_focus_set(Eo *eo_it EINA_UNUSED, Elm_Hoversel_Item_Data *it, Eina_Bool focused) { @@ -580,7 +580,7 @@ _elm_hoversel_item_elm_widget_item_focus_set(Eo *eo_it EINA_UNUSED, } EOLIAN static Eina_Bool -_elm_hoversel_item_elm_widget_item_focus_get(Eo *eo_it EINA_UNUSED, +_elm_hoversel_item_elm_widget_item_item_focus_get(Eo *eo_it EINA_UNUSED, Elm_Hoversel_Item_Data *it) { return efl_ui_focus_object_focus_get(VIEW(it)); diff --git a/src/lib/elementary/elm_color_item.eo b/src/lib/elementary/elm_color_item.eo index 84cebb1069..80e117242e 100644 --- a/src/lib/elementary/elm_color_item.eo +++ b/src/lib/elementary/elm_color_item.eo @@ -41,7 +41,7 @@ class Elm.Color.Item(Elm.Widget.Item, Efl.Ui.Focus.Object, Efl.Access.Widget.Act Efl.Object.destructor; Elm.Widget.Item.access_register; Elm.Widget.Item.signal_emit; - Elm.Widget.Item.focus { get; set; } + Elm.Widget.Item.item_focus { get; set; } Efl.Ui.Focus.Object.focus { set; } Efl.Ui.Focus.Object.focus_geometry { get; } Efl.Access.state_set { get; } diff --git a/src/lib/elementary/elm_colorselector.c b/src/lib/elementary/elm_colorselector.c index f040f11308..8f9c97cad6 100644 --- a/src/lib/elementary/elm_colorselector.c +++ b/src/lib/elementary/elm_colorselector.c @@ -2631,7 +2631,7 @@ _elm_color_item_efl_access_state_set_get(Eo *obj, Elm_Color_Item_Data *sd EINA_U } EOLIAN static void -_elm_color_item_elm_widget_item_focus_set(Eo *eo_it, Elm_Color_Item_Data *it, Eina_Bool focused) +_elm_color_item_elm_widget_item_item_focus_set(Eo *eo_it, Elm_Color_Item_Data *it, Eina_Bool focused) { Evas_Object *obj = WIDGET(it); ELM_COLORSELECTOR_DATA_GET(obj, sd); @@ -2657,7 +2657,7 @@ _elm_color_item_elm_widget_item_focus_set(Eo *eo_it, Elm_Color_Item_Data *it, Ei } EOLIAN static Eina_Bool -_elm_color_item_elm_widget_item_focus_get(Eo *eo_it, Elm_Color_Item_Data *it) +_elm_color_item_elm_widget_item_item_focus_get(Eo *eo_it, Elm_Color_Item_Data *it) { Evas_Object *obj = WIDGET(it); ELM_COLORSELECTOR_DATA_GET(obj, sd); diff --git a/src/lib/elementary/elm_ctxpopup_item.eo b/src/lib/elementary/elm_ctxpopup_item.eo index 97327cc5da..b713716435 100644 --- a/src/lib/elementary/elm_ctxpopup_item.eo +++ b/src/lib/elementary/elm_ctxpopup_item.eo @@ -22,7 +22,7 @@ class Elm.Ctxpopup.Item(Elm.Widget.Item, Efl.Ui.Item, Efl.Access.Widget.Action, Elm.Widget.Item.part_text { get; set; } Elm.Widget.Item.part_content { get; set; } Elm.Widget.Item.part_content_unset; - Elm.Widget.Item.focus { get; set; } + Elm.Widget.Item.item_focus { get; set; } Efl.Ui.Item.selected { get; set; } Efl.Ui.Item.prev { get; } Efl.Ui.Item.next { get; } diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c index 3834614629..3130ea65a7 100644 --- a/src/lib/elementary/elm_gengrid.c +++ b/src/lib/elementary/elm_gengrid.c @@ -3801,7 +3801,7 @@ _elm_gengrid_item_elm_widget_item_signal_emit(Eo *eo_it EINA_UNUSED, Elm_Gen_Ite } EOLIAN static void -_elm_gengrid_item_elm_widget_item_focus_set(Eo *eo_it, Elm_Gen_Item *it, Eina_Bool focused) +_elm_gengrid_item_elm_widget_item_item_focus_set(Eo *eo_it, Elm_Gen_Item *it, Eina_Bool focused) { ELM_GENGRID_ITEM_CHECK_OR_RETURN(it); Evas_Object *obj = WIDGET(it); @@ -3833,7 +3833,7 @@ _elm_gengrid_item_elm_widget_item_focus_set(Eo *eo_it, Elm_Gen_Item *it, Eina_Bo } EOLIAN static Eina_Bool -_elm_gengrid_item_elm_widget_item_focus_get(Eo *eo_it, Elm_Gen_Item *it) +_elm_gengrid_item_elm_widget_item_item_focus_get(Eo *eo_it, Elm_Gen_Item *it) { ELM_GENGRID_ITEM_CHECK_OR_RETURN(it, EINA_FALSE); Evas_Object *obj = WIDGET(it); diff --git a/src/lib/elementary/elm_gengrid_item.eo b/src/lib/elementary/elm_gengrid_item.eo index 51918d859c..e761d9deb9 100644 --- a/src/lib/elementary/elm_gengrid_item.eo +++ b/src/lib/elementary/elm_gengrid_item.eo @@ -243,7 +243,7 @@ class Elm.Gengrid.Item(Elm.Widget.Item.Static_Focus, Efl.Ui.Focus.Object, Efl.Ui Elm.Widget.Item.del_pre; Elm.Widget.Item.disable; Elm.Widget.Item.signal_emit; - Elm.Widget.Item.focus { get; set; } + Elm.Widget.Item.item_focus { get; set; } Elm.Widget.Item.part_text { get; } Elm.Widget.Item.part_content { get; } Elm.Widget.Item.tooltip_text_set; diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c index 4bba00ebca..d2fac798d6 100644 --- a/src/lib/elementary/elm_genlist.c +++ b/src/lib/elementary/elm_genlist.c @@ -6122,7 +6122,7 @@ _elm_genlist_item_elm_widget_item_style_get(Eo *eo_it EINA_UNUSED, } EOLIAN static void -_elm_genlist_item_elm_widget_item_focus_set(Eo *eo_it, Elm_Gen_Item *it, Eina_Bool focused) +_elm_genlist_item_elm_widget_item_item_focus_set(Eo *eo_it, Elm_Gen_Item *it, Eina_Bool focused) { Evas_Object *obj = WIDGET(it); ELM_GENLIST_DATA_GET(obj, sd); @@ -6160,7 +6160,7 @@ _elm_genlist_item_elm_widget_item_focus_set(Eo *eo_it, Elm_Gen_Item *it, Eina_Bo } EOLIAN static Eina_Bool -_elm_genlist_item_elm_widget_item_focus_get(Eo *eo_it, Elm_Gen_Item *it) +_elm_genlist_item_elm_widget_item_item_focus_get(Eo *eo_it, Elm_Gen_Item *it) { Evas_Object *obj = WIDGET(it); ELM_GENLIST_DATA_GET(obj, sd); diff --git a/src/lib/elementary/elm_genlist_item.eo b/src/lib/elementary/elm_genlist_item.eo index 3d2c18db72..dff1b55302 100644 --- a/src/lib/elementary/elm_genlist_item.eo +++ b/src/lib/elementary/elm_genlist_item.eo @@ -449,7 +449,7 @@ class Elm.Genlist.Item(Elm.Widget.Item.Static_Focus, Efl.Ui.Legacy) Elm.Widget.Item.disable; Elm.Widget.Item.signal_emit; Elm.Widget.Item.style { get; set; } - Elm.Widget.Item.focus { get; set; } + Elm.Widget.Item.item_focus { get; set; } Elm.Widget.Item.part_text { get; } Elm.Widget.Item.part_content { get; } Elm.Widget.Item.tooltip_text_set; diff --git a/src/lib/elementary/elm_hoversel_item.eo b/src/lib/elementary/elm_hoversel_item.eo index 6f5c7f7f55..4497a14e2c 100644 --- a/src/lib/elementary/elm_hoversel_item.eo +++ b/src/lib/elementary/elm_hoversel_item.eo @@ -28,6 +28,6 @@ class Elm.Hoversel.Item(Elm.Widget.Item, Efl.Ui.Legacy) Elm.Widget.Item.signal_emit; Elm.Widget.Item.part_text { get; set; } Elm.Widget.Item.style { get; set; } - Elm.Widget.Item.focus { get; set; } + Elm.Widget.Item.item_focus { get; set; } } } diff --git a/src/lib/elementary/elm_list.c b/src/lib/elementary/elm_list.c index 624775e43e..7fe5a888e7 100644 --- a/src/lib/elementary/elm_list.c +++ b/src/lib/elementary/elm_list.c @@ -2057,7 +2057,7 @@ EOLIAN static void _elm_list_item_elm_widget_item_signal_emit(Eo *eo_it EINA_UNU } EOLIAN static void -_elm_list_item_elm_widget_item_focus_set(Eo *eo_it, Elm_List_Item_Data *it, Eina_Bool focused) +_elm_list_item_elm_widget_item_item_focus_set(Eo *eo_it, Elm_List_Item_Data *it, Eina_Bool focused) { Evas_Object *obj = WIDGET(it); ELM_LIST_DATA_GET(obj, sd); @@ -2089,7 +2089,7 @@ _elm_list_item_elm_widget_item_focus_set(Eo *eo_it, Elm_List_Item_Data *it, Eina } EOLIAN static Eina_Bool -_elm_list_item_elm_widget_item_focus_get(Eo *eo_it, Elm_List_Item_Data *it) +_elm_list_item_elm_widget_item_item_focus_get(Eo *eo_it, Elm_List_Item_Data *it) { ELM_LIST_ITEM_CHECK_OR_RETURN(it, EINA_FALSE); Evas_Object *obj = WIDGET(it); diff --git a/src/lib/elementary/elm_list_item.eo b/src/lib/elementary/elm_list_item.eo index 7030486d36..7844d3d68a 100644 --- a/src/lib/elementary/elm_list_item.eo +++ b/src/lib/elementary/elm_list_item.eo @@ -111,7 +111,7 @@ class Elm.List.Item(Elm.Widget.Item, Efl.Ui.Legacy) Elm.Widget.Item.disable; Elm.Widget.Item.del_pre; Elm.Widget.Item.signal_emit; - Elm.Widget.Item.focus { get; set; } + Elm.Widget.Item.item_focus { get; set; } Elm.Widget.Item.part_text { get; set; } Elm.Widget.Item.part_content { get; set; } Elm.Widget.Item.part_content_unset; diff --git a/src/lib/elementary/elm_toolbar.c b/src/lib/elementary/elm_toolbar.c index 009fac295b..29be9fbc31 100644 --- a/src/lib/elementary/elm_toolbar.c +++ b/src/lib/elementary/elm_toolbar.c @@ -785,7 +785,7 @@ _elm_toolbar_efl_ui_focus_object_on_focus_update(Eo *obj, Elm_Toolbar_Data *sd) } EOLIAN static void -_elm_toolbar_item_elm_widget_item_focus_set(Eo *eo_it, Elm_Toolbar_Item_Data *it, Eina_Bool focused) +_elm_toolbar_item_elm_widget_item_item_focus_set(Eo *eo_it, Elm_Toolbar_Item_Data *it, Eina_Bool focused) { ELM_TOOLBAR_ITEM_CHECK(it); Evas_Object *obj = WIDGET(it); @@ -824,7 +824,7 @@ _elm_toolbar_item_elm_widget_item_focus_set(Eo *eo_it, Elm_Toolbar_Item_Data *it } EOLIAN static Eina_Bool -_elm_toolbar_item_elm_widget_item_focus_get(Eo *eo_it, Elm_Toolbar_Item_Data *it) +_elm_toolbar_item_elm_widget_item_item_focus_get(Eo *eo_it, Elm_Toolbar_Item_Data *it) { ELM_TOOLBAR_ITEM_CHECK_OR_RETURN(it, EINA_FALSE); Evas_Object *obj = WIDGET(it); diff --git a/src/lib/elementary/elm_toolbar_item.eo b/src/lib/elementary/elm_toolbar_item.eo index ff675bb606..d3b78c2ec5 100644 --- a/src/lib/elementary/elm_toolbar_item.eo +++ b/src/lib/elementary/elm_toolbar_item.eo @@ -267,7 +267,7 @@ class Elm.Toolbar.Item(Elm.Widget.Item, Efl.Ui.Item, Efl.Ui.Focus.Object, Efl.Ui Efl.Object.destructor; Elm.Widget.Item.disable; Elm.Widget.Item.disabled { set; } - Elm.Widget.Item.focus { get; set; } + Elm.Widget.Item.item_focus { get; set; } Elm.Widget.Item.signal_emit; Elm.Widget.Item.part_text { get; set; } Elm.Widget.Item.part_content { get; set; } diff --git a/src/lib/elementary/elm_widget_item.eo b/src/lib/elementary/elm_widget_item.eo index ec8181cdab..3df4638fe3 100644 --- a/src/lib/elementary/elm_widget_item.eo +++ b/src/lib/elementary/elm_widget_item.eo @@ -147,13 +147,15 @@ class Elm.Widget.Item(Efl.Object, Efl.Access, label: string; [[Label name]] } } - @property focus { + @property item_focus { [[Control the object item focused @since 1.10]] get { + legacy: elm_object_item_focus_get; } set { + legacy: elm_object_item_focus_set; } values { focused: bool; [[The focused state]] --
