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

widget: Rename on_focus to on_focus_update (EO) 

on_focus seems to imply that focus was just given to the widget, but
that function is called on any focus change (in and out).

Ref T5363
This commit is contained in:
Jean-Philippe Andre 2017-08-31 15:20:33 +09:00
parent 89492d859b
commit c0d7ea4af0
40 changed files with 60 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -512,11 +512,11 @@ _efl_ui_clock_elm_widget_focus_next(Eo *obj, Efl_Ui_Clock_Data *_pd EINA_UNUSED,
}
EOLIAN static Eina_Bool
_efl_ui_clock_elm_widget_on_focus(Eo *obj, Efl_Ui_Clock_Data *sd, Elm_Object_Item *item EINA_UNUSED)
_efl_ui_clock_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Clock_Data *sd, Elm_Object_Item *item EINA_UNUSED)
{
Eina_Bool int_ret = EINA_FALSE;
int_ret = elm_obj_widget_on_focus(efl_super(obj, MY_CLASS), NULL);
int_ret = elm_obj_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL);
if (!int_ret) return EINA_FALSE;
if (!elm_widget_focus_get(obj))

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

@ -248,7 +248,7 @@ class Efl.Ui.Clock (Efl.Ui.Layout)
Elm.Widget.focus_next_manager_is;
Elm.Widget.focus_next;
Elm.Widget.on_disabled_update;
Elm.Widget.on_focus;
Elm.Widget.on_focus_update;
Elm.Widget.translate;
}
events {

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

@ -861,12 +861,12 @@ _mouse_up_cb(void *data,
}
EOLIAN static Eina_Bool
_efl_ui_image_zoomable_elm_widget_on_focus(Eo *obj, Efl_Ui_Image_Zoomable_Data *_pd EINA_UNUSED, Elm_Object_Item *item EINA_UNUSED)
_efl_ui_image_zoomable_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Image_Zoomable_Data *_pd EINA_UNUSED, Elm_Object_Item *item EINA_UNUSED)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
Eina_Bool int_ret = EINA_FALSE;
int_ret = elm_obj_widget_on_focus(efl_super(obj, MY_CLASS), NULL);
int_ret = elm_obj_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL);
if (!int_ret) return EINA_FALSE;
if (elm_widget_focus_get(obj))

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

@ -61,7 +61,7 @@ class Efl.Ui.Image_Zoomable (Elm.Widget, Efl.Ui.Image, Efl.Ui.Zoom,
Efl.Ui.Zoom.zoom_mode { set; get; }
Efl.Canvas.Group.group_member_add;
Elm.Widget.theme_apply;
Elm.Widget.on_focus;
Elm.Widget.on_focus_update;
Elm.Widget.widget_event;
Elm.Interface_Scrollable.region_bring_in;
Elm.Interface.Atspi_Widget_Action.elm_actions { get; }

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

@ -396,7 +396,7 @@ _efl_ui_layout_list_data_get(const Eina_List *list)
}
EOLIAN static Eina_Bool
_efl_ui_layout_elm_widget_on_focus(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED, Elm_Object_Item *item EINA_UNUSED)
_efl_ui_layout_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED, Elm_Object_Item *item EINA_UNUSED)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);

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

@ -66,7 +66,7 @@ class Efl.Ui.Layout (Elm.Widget, Efl.Part, Efl.Container, Efl.File,
Elm.Widget.focus_next;
Elm.Widget.on_disabled_update;
Elm.Widget.widget_sub_object_del;
Elm.Widget.on_focus;
Elm.Widget.on_focus_update;
Efl.Container.content_count;
Efl.Container.content_remove;
Efl.Container.content_iterate;

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

@ -1477,11 +1477,11 @@ _efl_ui_slider_elm_widget_focus_direction_manager_is(Eo *obj EINA_UNUSED, Efl_Ui
}
EOLIAN static Eina_Bool
_efl_ui_slider_elm_widget_on_focus(Eo *obj, Efl_Ui_Slider_Data *sd EINA_UNUSED, Elm_Object_Item *item EINA_UNUSED)
_efl_ui_slider_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Slider_Data *sd EINA_UNUSED, Elm_Object_Item *item EINA_UNUSED)
{
Eina_Bool int_ret = EINA_FALSE;
int_ret = elm_obj_widget_on_focus(efl_super(obj, MY_CLASS), NULL);
int_ret = elm_obj_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL);
if ((sd->indicator_visible_mode == ELM_SLIDER_INDICATOR_VISIBLE_MODE_ON_FOCUS) && elm_widget_focus_get(obj))
_popup_show(obj, NULL, NULL, NULL);

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

@ -119,7 +119,7 @@ class Efl.Ui.Slider (Efl.Ui.Layout, Efl.Ui.Range, Efl.Ui.Direction,
Elm.Widget.on_access_activate;
Elm.Widget.focus_next_manager_is;
Elm.Widget.focus_direction_manager_is;
Elm.Widget.on_focus;
Elm.Widget.on_focus_update;
Elm.Widget.widget_event;
Efl.Ui.Range.span_size { get; set; }
Efl.Ui.Range.range_value { get; set; }

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

@ -1143,7 +1143,7 @@ _return_key_enabled_check(Evas_Object *obj)
}
EOLIAN static Eina_Bool
_efl_ui_text_elm_widget_on_focus(Eo *obj, Efl_Ui_Text_Data *sd, Elm_Object_Item *item EINA_UNUSED)
_efl_ui_text_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Text_Data *sd, Elm_Object_Item *item EINA_UNUSED)
{
Evas_Object *top;
Eina_Bool top_is_win = EINA_FALSE;

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

@ -410,7 +410,7 @@ class Efl.Ui.Text (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
Elm.Widget.on_access_activate;
Elm.Widget.focus_direction_manager_is;
Elm.Widget.theme_apply;
Elm.Widget.on_focus;
Elm.Widget.on_focus_update;
Elm.Widget.focus_region { get; }
Elm.Widget.on_disabled_update;
Elm.Widget.widget_sub_object_del;

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

@ -1699,9 +1699,9 @@ _efl_ui_win_elm_widget_focus_direction(Eo *obj, Efl_Ui_Win_Data *_pd EINA_UNUSED
}
EOLIAN static Eina_Bool
_efl_ui_win_elm_widget_on_focus(Eo *obj, Efl_Ui_Win_Data *sd, Elm_Object_Item *item EINA_UNUSED)
_efl_ui_win_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Win_Data *sd, Elm_Object_Item *item EINA_UNUSED)
{
if (!elm_obj_widget_on_focus(efl_super(obj, MY_CLASS), NULL))
if (!elm_obj_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL))
return EINA_TRUE;
if (sd->img_obj)

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

@ -900,7 +900,7 @@ class Efl.Ui.Win (Elm.Widget, Efl.Canvas, Elm.Interface.Atspi.Window,
Elm.Widget.focus_next;
Elm.Widget.theme_apply;
Elm.Widget.focus { get; }
Elm.Widget.on_focus;
Elm.Widget.on_focus_update;
Elm.Widget.widget_event;
Elm.Widget.focus_manager_factory;
Elm.Interface.Atspi_Accessible.parent { get; }

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

@ -346,7 +346,7 @@ _view_update(Elm_Multibuttonentry_Data *sd)
}
EOLIAN static Eina_Bool
_elm_multibuttonentry_elm_widget_on_focus(Eo *obj, Elm_Multibuttonentry_Data *sd, Elm_Object_Item *item EINA_UNUSED)
_elm_multibuttonentry_elm_widget_on_focus_update(Eo *obj, Elm_Multibuttonentry_Data *sd, Elm_Object_Item *item EINA_UNUSED)
{
if (elm_widget_focus_get(obj))
{

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

@ -145,7 +145,7 @@ _elm_access_elm_widget_on_access_activate(Eo *obj, void *_pd EINA_UNUSED, Elm_Ac
}
EOLIAN static Eina_Bool
_elm_access_elm_widget_on_focus(Eo *obj, void *_pd EINA_UNUSED, Elm_Object_Item *item EINA_UNUSED)
_elm_access_elm_widget_on_focus_update(Eo *obj, void *_pd EINA_UNUSED, Elm_Object_Item *item EINA_UNUSED)
{
evas_object_focus_set(obj, elm_widget_focus_get(obj));

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

@ -8,7 +8,7 @@ class Elm.Access (Elm.Widget, Elm.Interface.Atspi_Widget_Action)
class.constructor;
Efl.Object.constructor;
Elm.Widget.on_access_activate;
Elm.Widget.on_focus;
Elm.Widget.on_focus_update;
Elm.Interface.Atspi_Widget_Action.elm_actions { get; }
Elm.Interface.Atspi_Accessible.state_set { get; }
}

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

@ -1640,11 +1640,11 @@ _key_action_move(Evas_Object *obj, const char *params)
}
EOLIAN static Eina_Bool
_elm_calendar_elm_widget_on_focus(Eo *obj, Elm_Calendar_Data *sd, Elm_Object_Item *item EINA_UNUSED)
_elm_calendar_elm_widget_on_focus_update(Eo *obj, Elm_Calendar_Data *sd, Elm_Object_Item *item EINA_UNUSED)
{
Eina_Bool int_ret = EINA_FALSE;
int_ret = elm_obj_widget_on_focus(efl_super(obj, MY_CLASS), NULL);
int_ret = elm_obj_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL);
if (!int_ret) return EINA_FALSE;
if (elm_widget_focus_get(obj))

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

@ -417,7 +417,7 @@ class Elm.Calendar (Efl.Ui.Layout, Elm.Interface.Atspi_Widget_Action)
Elm.Widget.focus_direction_manager_is;
Elm.Widget.on_access_update;
Elm.Widget.focus_next;
Elm.Widget.on_focus;
Elm.Widget.on_focus_update;
Elm.Widget.widget_event;
Elm.Interface.Atspi_Widget_Action.elm_actions { get; }
}

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

@ -896,12 +896,12 @@ _elm_diskselector_elm_widget_widget_sub_object_del(Eo *obj, Elm_Diskselector_Dat
}
EOLIAN static Eina_Bool
_elm_diskselector_elm_widget_on_focus(Eo *obj, Elm_Diskselector_Data *_pd EINA_UNUSED, Elm_Object_Item *item EINA_UNUSED)
_elm_diskselector_elm_widget_on_focus_update(Eo *obj, Elm_Diskselector_Data *_pd EINA_UNUSED, Elm_Object_Item *item EINA_UNUSED)
{
Eina_Bool int_ret = EINA_FALSE;
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
int_ret = elm_obj_widget_on_focus(efl_super(obj, MY_CLASS), NULL);
int_ret = elm_obj_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL);
if (!int_ret) return EINA_FALSE;
if (elm_widget_focus_get(obj))

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

@ -205,7 +205,7 @@ class Elm.Diskselector (Elm.Widget, Elm.Interface_Scrollable,
Elm.Widget.on_access_update;
Elm.Widget.focus_next;
Elm.Widget.theme_apply;
Elm.Widget.on_focus;
Elm.Widget.on_focus_update;
Elm.Widget.translate;
Elm.Widget.widget_sub_object_del;
Elm.Widget.widget_event;

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

@ -1300,7 +1300,7 @@ _elm_entry_focus_update(Eo *obj, Elm_Entry_Data *sd)
}
EOLIAN static Eina_Bool
_elm_entry_elm_widget_on_focus(Eo *obj, Elm_Entry_Data *sd, Elm_Object_Item *item EINA_UNUSED)
_elm_entry_elm_widget_on_focus_update(Eo *obj, Elm_Entry_Data *sd, Elm_Object_Item *item EINA_UNUSED)
{
_elm_entry_focus_update(obj, sd);

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

@ -960,7 +960,7 @@ class Elm.Entry (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
Elm.Widget.on_access_activate;
Elm.Widget.focus_direction_manager_is;
Elm.Widget.theme_apply;
Elm.Widget.on_focus;
Elm.Widget.on_focus_update;
Elm.Widget.focus_region { get; }
Elm.Widget.on_disabled_update;
Elm.Widget.widget_sub_object_del;

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

@ -3485,12 +3485,12 @@ _elm_gengrid_nearest_visible_item_get(Evas_Object *obj, Elm_Object_Item *eo_it)
}
EOLIAN static Eina_Bool
_elm_gengrid_elm_widget_on_focus(Eo *obj, Elm_Gengrid_Data *sd, Elm_Object_Item *item)
_elm_gengrid_elm_widget_on_focus_update(Eo *obj, Elm_Gengrid_Data *sd, Elm_Object_Item *item)
{
Eina_Bool int_ret = EINA_FALSE;
Elm_Object_Item *eo_it = NULL;
int_ret = elm_obj_widget_on_focus(efl_super(obj, MY_CLASS), NULL);
int_ret = elm_obj_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL);
if (!int_ret) return EINA_FALSE;
if (elm_widget_focus_get(obj) && (sd->selected) &&

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

@ -553,7 +553,7 @@ class Elm.Gengrid (Efl.Ui.Layout, Elm.Interface_Scrollable,
Elm.Widget.on_access_update;
Elm.Widget.focus_next;
Elm.Widget.focus_direction;
Elm.Widget.on_focus;
Elm.Widget.on_focus_update;
Elm.Widget.focus_region { get; }
Elm.Widget.widget_event;
Elm.Widget.focus_highlight_geometry { get; }

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

@ -3290,13 +3290,13 @@ _elm_genlist_nearest_visible_item_get(Evas_Object *obj, Elm_Object_Item *eo_it)
}
EOLIAN static Eina_Bool
_elm_genlist_elm_widget_on_focus(Eo *obj, Elm_Genlist_Data *sd, Elm_Object_Item *item EINA_UNUSED)
_elm_genlist_elm_widget_on_focus_update(Eo *obj, Elm_Genlist_Data *sd, Elm_Object_Item *item EINA_UNUSED)
{
Eina_Bool int_ret = EINA_FALSE;
Elm_Object_Item *eo_it = NULL;
Eina_Bool is_sel = EINA_FALSE;
int_ret = elm_obj_widget_on_focus(efl_super(obj, MY_CLASS), NULL);
int_ret = elm_obj_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL);
if (!int_ret) return EINA_FALSE;
if (elm_widget_focus_get(obj) && (sd->items) && (sd->selected) &&

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

@ -538,7 +538,7 @@ class Elm.Genlist (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
Elm.Widget.on_access_update;
Elm.Widget.focus_highlight_geometry { get; }
Elm.Widget.focus_next;
Elm.Widget.on_focus;
Elm.Widget.on_focus_update;
Elm.Widget.focus_direction_manager_is;
Elm.Widget.widget_sub_object_del;
Elm.Widget.widget_event;

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

@ -27,12 +27,12 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = {
};
EOLIAN static Eina_Bool
_elm_glview_elm_widget_on_focus(Eo *obj, Elm_Glview_Data *_pd EINA_UNUSED, Elm_Object_Item *item EINA_UNUSED)
_elm_glview_elm_widget_on_focus_update(Eo *obj, Elm_Glview_Data *_pd EINA_UNUSED, Elm_Object_Item *item EINA_UNUSED)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
Eina_Bool int_ret = EINA_FALSE;
int_ret = elm_obj_widget_on_focus(efl_super(obj, MY_CLASS), NULL);
int_ret = elm_obj_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL);
if (!int_ret) return EINA_FALSE;
if (elm_widget_focus_get(obj))

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

@ -190,7 +190,7 @@ class Elm.Glview (Elm.Widget, Efl.Gfx.View)
class.constructor;
Efl.Object.finalize;
Efl.Gfx.size { set; }
Elm.Widget.on_focus;
Elm.Widget.on_focus_update;
Efl.Gfx.View.view_size { get; set; }
}
events {

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

@ -1234,13 +1234,13 @@ _elm_list_nearest_visible_item_get(Evas_Object *obj, Elm_List_Item_Data *it)
}
EOLIAN static Eina_Bool
_elm_list_elm_widget_on_focus(Eo *obj, Elm_List_Data *sd, Elm_Object_Item *item EINA_UNUSED)
_elm_list_elm_widget_on_focus_update(Eo *obj, Elm_List_Data *sd, Elm_Object_Item *item EINA_UNUSED)
{
Eina_Bool int_ret = EINA_FALSE;
Elm_Object_Item *eo_it = NULL;
Eina_Bool is_sel = EINA_FALSE;
int_ret = elm_obj_widget_on_focus(efl_super(obj, MY_CLASS), NULL);
int_ret = elm_obj_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL);
if (!int_ret) return EINA_FALSE;
if (elm_widget_focus_get(obj) && sd->selected && !sd->last_selected_item)

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

@ -440,7 +440,7 @@ class Elm.List (Efl.Ui.Layout, Elm.Interface_Scrollable,
Elm.Widget.focus_highlight_geometry { get; }
Elm.Widget.focus_next;
Elm.Widget.on_disabled_update;
Elm.Widget.on_focus;
Elm.Widget.on_focus_update;
Elm.Widget.translate;
Elm.Widget.widget_sub_object_del;
Elm.Widget.widget_event;

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

@ -3942,12 +3942,12 @@ _elm_map_pan_efl_gfx_position_set(Eo *obj, Elm_Map_Pan_Data *_pd EINA_UNUSED, Ev
}
EOLIAN static Eina_Bool
_elm_map_elm_widget_on_focus(Eo *obj, Elm_Map_Data *_pd EINA_UNUSED, Elm_Object_Item *item EINA_UNUSED)
_elm_map_elm_widget_on_focus_update(Eo *obj, Elm_Map_Data *_pd EINA_UNUSED, Elm_Object_Item *item EINA_UNUSED)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
Eina_Bool int_ret = EINA_FALSE;
int_ret = elm_obj_widget_on_focus(efl_super(obj, MY_CLASS), NULL);
int_ret = elm_obj_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL);
if (!int_ret) return EINA_FALSE;
if (elm_widget_focus_get(obj))

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

@ -631,7 +631,7 @@ class Elm.Map (Elm.Widget, Elm.Interface_Scrollable,
Efl.Gfx.size { set; }
Efl.Canvas.Group.group_member_add;
Elm.Widget.theme_apply;
Elm.Widget.on_focus;
Elm.Widget.on_focus_update;
Elm.Widget.widget_event;
Elm.Interface.Atspi_Widget_Action.elm_actions { get; }
}

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

@ -184,7 +184,7 @@ class Elm.Multibuttonentry (Efl.Ui.Layout)
Elm.Widget.on_access_update;
Elm.Widget.focus_direction;
Elm.Widget.focus_next;
Elm.Widget.on_focus;
Elm.Widget.on_focus_update;
Elm.Widget.translate;
Elm.Widget.widget_event;
Elm.Interface.Atspi_Accessible.children { get; }

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

@ -59,13 +59,13 @@ _elm_plug_resized(Ecore_Evas *ee)
}
EOLIAN static Eina_Bool
_elm_plug_elm_widget_on_focus(Eo *obj, void *sd EINA_UNUSED, Elm_Object_Item *item EINA_UNUSED)
_elm_plug_elm_widget_on_focus_update(Eo *obj, void *sd EINA_UNUSED, Elm_Object_Item *item EINA_UNUSED)
{
Eina_Bool int_ret = EINA_FALSE;
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
int_ret = elm_obj_widget_on_focus(efl_super(obj, MY_CLASS), NULL);
int_ret = elm_obj_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL);
if (!int_ret) return EINA_FALSE;
if (elm_widget_focus_get(obj))

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

@ -34,7 +34,7 @@ class Elm.Plug (Elm.Widget, Efl.Ui.Clickable)
class.constructor;
Efl.Object.constructor;
Elm.Widget.theme_apply;
Elm.Widget.on_focus;
Elm.Widget.on_focus_update;
}
events {
image,deleted; [[Called when image was deleted]]

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

@ -919,11 +919,11 @@ _elm_spinner_elm_layout_sizing_eval(Eo *obj, Elm_Spinner_Data *_pd EINA_UNUSED)
}
EOLIAN static Eina_Bool
_elm_spinner_elm_widget_on_focus(Eo *obj, Elm_Spinner_Data *sd, Elm_Object_Item *item EINA_UNUSED)
_elm_spinner_elm_widget_on_focus_update(Eo *obj, Elm_Spinner_Data *sd, Elm_Object_Item *item EINA_UNUSED)
{
Eina_Bool int_ret = EINA_FALSE;
int_ret = elm_obj_widget_on_focus(efl_super(obj, MY_CLASS), NULL);
int_ret = elm_obj_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL);
if (!int_ret) return EINA_FALSE;
if (!elm_widget_focus_get(obj))

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

@ -152,7 +152,7 @@ class Elm.Spinner (Efl.Ui.Layout, Efl.Ui.Spin,
Elm.Widget.on_access_update;
Elm.Widget.focus_next;
Elm.Widget.focus_direction;
Elm.Widget.on_focus;
Elm.Widget.on_focus_update;
Elm.Widget.widget_event;
Efl.Ui.Spin.min_max { get; set; }
Efl.Ui.Spin.step { get; set; }

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

@ -808,13 +808,13 @@ _elm_toolbar_nearest_visible_item_get(Evas_Object *obj, Elm_Object_Item *eo_it)
}
EOLIAN static Eina_Bool
_elm_toolbar_elm_widget_on_focus(Eo *obj, Elm_Toolbar_Data *sd, Elm_Object_Item *item EINA_UNUSED)
_elm_toolbar_elm_widget_on_focus_update(Eo *obj, Elm_Toolbar_Data *sd, Elm_Object_Item *item EINA_UNUSED)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
Eina_Bool int_ret = EINA_FALSE;
Elm_Object_Item *eo_it = NULL;
int_ret = elm_obj_widget_on_focus(efl_super(obj, MY_CLASS), NULL);
int_ret = elm_obj_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL);
if (!int_ret) return EINA_FALSE;
if (!sd->items) return EINA_FALSE;

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

@ -324,7 +324,7 @@ class Elm.Toolbar (Elm.Widget, Elm.Interface_Scrollable, Efl.Ui.Direction,
Elm.Widget.on_access_update;
Elm.Widget.focus_next;
Elm.Widget.theme_apply;
Elm.Widget.on_focus;
Elm.Widget.on_focus_update;
Elm.Widget.translate;
Elm.Widget.widget_event;
Elm.Widget.focus_highlight_geometry { get; }

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

@ -1121,7 +1121,7 @@ _parent_focus(Evas_Object *obj, Elm_Object_Item *item)
sd->focused = EINA_TRUE;
if (sd->top_win_focused)
elm_obj_widget_on_focus(obj, item);
elm_obj_widget_on_focus_update(obj, item);
sd->focus_order_on_calc = EINA_FALSE;
if (_elm_config->access_mode == ELM_ACCESS_MODE_ON)
@ -3161,7 +3161,7 @@ _elm_widget_focus_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool focus)
focus_order++;
sd->focus_order = focus_order;
sd->focused = EINA_TRUE;
elm_obj_widget_on_focus(obj, NULL);
elm_obj_widget_on_focus_update(obj, NULL);
}
if (focus)
@ -3242,7 +3242,7 @@ _elm_widget_focused_object_clear(Eo *obj, Elm_Widget_Smart_Data *sd)
_focused_object_clear(sd);
sd->focused = EINA_FALSE;
if (sd->top_win_focused)
elm_obj_widget_on_focus(obj, NULL);
elm_obj_widget_on_focus_update(obj, NULL);
}
static Eo *
@ -3295,7 +3295,7 @@ _parents_on_focus(Evas_Object *obj)
Evas_Object *o = elm_widget_parent_get(obj);
if (o) _parents_on_focus(o);
elm_obj_widget_on_focus(obj, NULL);
elm_obj_widget_on_focus_update(obj, NULL);
}
EOLIAN static void
@ -3333,7 +3333,7 @@ _elm_widget_top_win_focused_set(Evas_Object *obj,
sd->top_win_focused = top_win_focused;
if (sd->focused && !sd->top_win_focused)
elm_obj_widget_on_focus(obj, NULL);
elm_obj_widget_on_focus_update(obj, NULL);
}
Eina_Bool
@ -6145,7 +6145,7 @@ _elm_widget_efl_object_debug_name_override(Eo *obj, Elm_Widget_Smart_Data *sd EI
}
EOLIAN static Eina_Bool
_elm_widget_on_focus(Eo *obj, Elm_Widget_Smart_Data *sd, Elm_Object_Item *item EINA_UNUSED)
_elm_widget_on_focus_update(Eo *obj, Elm_Widget_Smart_Data *sd, Elm_Object_Item *item EINA_UNUSED)
{
Eina_Bool focused;
const Efl_Event_Description *desc;
@ -6425,7 +6425,7 @@ EOLIAN static void
_elm_widget_efl_ui_focus_object_focus_set(Eo *obj, Elm_Widget_Smart_Data *pd, Eina_Bool focus)
{
pd->focused = focus;
elm_obj_widget_on_focus(obj, NULL);
elm_obj_widget_on_focus_update(obj, NULL);
efl_ui_focus_object_focus_set(efl_super(obj, MY_CLASS), focus);
}

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

@ -398,7 +398,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible,
return: Efl.Ui.Theme.Apply; [[Indicates success, and if the current
theme or default theme was used.]]
}
on_focus @protected {
on_focus_update @protected {
[[Virtual function handling focus in/out events on the widget]]
params {
/* FIXME: EO API is not supposed to have any widget item!!! */