kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

widget: Move on_focus_update to Focus.Object 

Following @taxi2se's recommendation. This is indeed a focus method, and
Widget already inherits from Focus.Object.

Ping @bu5hm4n who probably wants to adapt this further.

Ref T5363
This commit is contained in:
Jean-Philippe Andre 2018-01-19 17:25:47 +09:00
parent c35f257bf2
commit 20570f74d3
42 changed files with 62 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -863,11 +863,11 @@ _key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED)
}
EOLIAN static Eina_Bool
_efl_ui_calendar_efl_ui_widget_on_focus_update(Eo *obj, Efl_Ui_Calendar_Data *sd)
_efl_ui_calendar_efl_ui_focus_object_on_focus_update(Eo *obj, Efl_Ui_Calendar_Data *sd)
{
Eina_Bool int_ret = EINA_FALSE;
int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS));
int_ret = efl_ui_focus_object_on_focus_update(efl_super(obj, MY_CLASS));
if (!int_ret) return EINA_FALSE;
// FIXME : Currently, focused item is same with selected item.

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

@ -108,7 +108,7 @@ class Efl.Ui.Calendar (Efl.Ui.Layout, Efl.Ui.Focus.Composition, Efl.Access.Widge
Efl.Canvas.Group.group_calculate;
Efl.Ui.Widget.theme_apply;
Efl.Ui.Widget.on_access_update;
Efl.Ui.Widget.on_focus_update;
Efl.Ui.Focus.Object.on_focus_update;
Efl.Ui.Widget.widget_event;
Efl.Access.Widget.Action.elm_actions { get; }
Efl.Ui.Format.format_cb { set; }

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

@ -449,11 +449,11 @@ _efl_ui_clock_edit_mode_get(Eo *obj EINA_UNUSED, Efl_Ui_Clock_Data *sd)
}
EOLIAN static Eina_Bool
_efl_ui_clock_efl_ui_widget_on_focus_update(Eo *obj, Efl_Ui_Clock_Data *sd)
_efl_ui_clock_efl_ui_focus_object_on_focus_update(Eo *obj, Efl_Ui_Clock_Data *sd)
{
Eina_Bool int_ret = EINA_FALSE;
int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS));
int_ret = efl_ui_focus_object_on_focus_update(efl_super(obj, MY_CLASS));
if (!int_ret) return EINA_FALSE;
if (!efl_ui_focus_object_focus_get(obj))

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

@ -226,7 +226,7 @@ class Efl.Ui.Clock (Efl.Ui.Layout)
Efl.Object.constructor;
Efl.Ui.Widget.theme_apply;
Efl.Ui.Widget.on_disabled_update;
Efl.Ui.Widget.on_focus_update;
Efl.Ui.Focus.Object.on_focus_update;
Efl.Ui.Translatable.translation_update;
}
events {

5
src/lib/elementary/efl_ui_focus_object.eo
View File

@ -54,13 +54,16 @@ mixin Efl.Ui.Focus.Object
logical_parent : Efl.Ui.Focus.Object; [[The focus parent.]]
}
}
prepare_logical {
[[Tells the object that its children will be queried soon by the given manager.
Deleting manager items in this call will result in undefied behaviour and may cause your system to crash.
]]
}
on_focus_update @protected @pure_virtual {
[[Virtual function handling focus in/out events on the widget]]
return: bool; [[$true if this widget can handle focus, $false otherwise]]
}
}
implements {
@empty .focus_geometry;

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

@ -863,12 +863,12 @@ _mouse_up_cb(void *data,
}
EOLIAN static Eina_Bool
_efl_ui_image_zoomable_efl_ui_widget_on_focus_update(Eo *obj, Efl_Ui_Image_Zoomable_Data *_pd EINA_UNUSED)
_efl_ui_image_zoomable_efl_ui_focus_object_on_focus_update(Eo *obj, Efl_Ui_Image_Zoomable_Data *_pd EINA_UNUSED)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
Eina_Bool int_ret = EINA_FALSE;
int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS));
int_ret = efl_ui_focus_object_on_focus_update(efl_super(obj, MY_CLASS));
if (!int_ret) return EINA_FALSE;
if (efl_ui_focus_object_focus_get(obj))

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

@ -59,7 +59,7 @@ class Efl.Ui.Image_Zoomable (Efl.Ui.Widget, Efl.Ui.Image, Efl.Ui.Zoom,
Efl.Ui.Zoom.zoom_mode { set; get; }
Efl.Canvas.Group.group_member_add;
Efl.Ui.Widget.theme_apply;
Efl.Ui.Widget.on_focus_update;
Efl.Ui.Focus.Object.on_focus_update;
Efl.Ui.Widget.widget_event;
Efl.Ui.Scrollable.Interactive.scroll;
Efl.Access.Widget.Action.elm_actions { get; }

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

@ -393,7 +393,7 @@ _efl_ui_layout_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Layout_Data *sd)
}
EOLIAN static Eina_Bool
_efl_ui_layout_efl_ui_widget_on_focus_update(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED)
_efl_ui_layout_efl_ui_focus_object_on_focus_update(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
@ -410,7 +410,7 @@ _efl_ui_layout_efl_ui_widget_on_focus_update(Eo *obj, Efl_Ui_Layout_Data *_pd EI
evas_object_focus_set(wd->resize_obj, EINA_FALSE);
}
efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS));
efl_ui_focus_object_on_focus_update(efl_super(obj, MY_CLASS));
if (efl_isa(wd->resize_obj, EFL_CANVAS_LAYOUT_CLASS))
edje_object_message_signal_process(wd->resize_obj);

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

@ -64,7 +64,7 @@ class Efl.Ui.Layout (Efl.Ui.Widget, Efl.Part, Efl.Container, Efl.File,
Efl.Ui.Widget.theme_apply;
Efl.Ui.Widget.on_disabled_update;
Efl.Ui.Widget.widget_sub_object_del;
Efl.Ui.Widget.on_focus_update;
Efl.Ui.Focus.Object.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

@ -1299,11 +1299,11 @@ _efl_ui_slider_step_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *sd)
}
EOLIAN static Eina_Bool
_efl_ui_slider_efl_ui_widget_on_focus_update(Eo *obj, Efl_Ui_Slider_Data *sd EINA_UNUSED)
_efl_ui_slider_efl_ui_focus_object_on_focus_update(Eo *obj, Efl_Ui_Slider_Data *sd EINA_UNUSED)
{
Eina_Bool int_ret = EINA_FALSE;
int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS));
int_ret = efl_ui_focus_object_on_focus_update(efl_super(obj, MY_CLASS));
if ((sd->indicator_visible_mode == ELM_SLIDER_INDICATOR_VISIBLE_MODE_ON_FOCUS) && efl_ui_focus_object_focus_get(obj))
_popup_show(obj, NULL, NULL, NULL);

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

@ -39,7 +39,7 @@ class Efl.Ui.Slider (Efl.Ui.Layout, Efl.Ui.Range, Efl.Ui.Direction,
Efl.Canvas.Group.group_calculate;
Efl.Ui.Widget.theme_apply;
Efl.Ui.Widget.on_access_activate;
Efl.Ui.Widget.on_focus_update;
Efl.Ui.Focus.Object.on_focus_update;
Efl.Ui.Widget.widget_event;
Efl.Ui.Range.range_value { get; set; }
Efl.Ui.Range.range_min_max {get; set; }

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

@ -568,11 +568,11 @@ _efl_ui_spin_button_efl_ui_widget_widget_event(Eo *obj, Efl_Ui_Spin_Button_Data
}
EOLIAN static Eina_Bool
_efl_ui_spin_button_efl_ui_widget_on_focus_update(Eo *obj, Efl_Ui_Spin_Button_Data *sd)
_efl_ui_spin_button_efl_ui_focus_object_on_focus_update(Eo *obj, Efl_Ui_Spin_Button_Data *sd)
{
Eina_Bool int_ret = EINA_FALSE;
int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS));
int_ret = efl_ui_focus_object_on_focus_update(efl_super(obj, MY_CLASS));
if (!int_ret) return EINA_FALSE;
if (!efl_ui_focus_object_focus_get(obj))

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

@ -66,7 +66,7 @@ class Efl.Ui.Spin_Button (Efl.Ui.Spin, Efl.Ui.Focus.Composition,
Efl.Object.constructor;
Efl.Ui.Widget.theme_apply;
Efl.Ui.Widget.widget_event;
Efl.Ui.Widget.on_focus_update;
Efl.Ui.Focus.Object.on_focus_update;
Efl.Ui.Range.range_value { set; }
Efl.Access.name { get; }
Efl.Access.Value.value_and_text { get; set; }

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

@ -1128,7 +1128,7 @@ _return_key_enabled_check(Evas_Object *obj)
}
EOLIAN static Eina_Bool
_efl_ui_text_efl_ui_widget_on_focus_update(Eo *obj, Efl_Ui_Text_Data *sd)
_efl_ui_text_efl_ui_focus_object_on_focus_update(Eo *obj, Efl_Ui_Text_Data *sd)
{
Evas_Object *top;
Eina_Bool top_is_win = EINA_FALSE;

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

@ -331,7 +331,7 @@ class Efl.Ui.Text (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
Efl.Layout.Signal.signal_emit;
Efl.Ui.Widget.on_access_activate;
Efl.Ui.Widget.theme_apply;
Efl.Ui.Widget.on_focus_update;
Efl.Ui.Focus.Object.on_focus_update;
Efl.Ui.Widget.interest_region { get; }
Efl.Ui.Widget.on_disabled_update;
Efl.Ui.Widget.widget_sub_object_del;

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

@ -2390,7 +2390,7 @@ _elm_widget_top_win_focused_set(Evas_Object *obj,
sd->top_win_focused = top_win_focused;
if (sd->focused && !sd->top_win_focused)
efl_ui_widget_on_focus_update(obj);
efl_ui_focus_object_on_focus_update(obj);
}
Eina_Bool
@ -5236,7 +5236,7 @@ _efl_ui_widget_efl_object_debug_name_override(Eo *obj, Elm_Widget_Smart_Data *sd
}
EOLIAN static Eina_Bool
_efl_ui_widget_on_focus_update(Eo *obj, Elm_Widget_Smart_Data *sd)
_efl_ui_widget_efl_ui_focus_object_on_focus_update(Eo *obj, Elm_Widget_Smart_Data *sd)
{
Eina_Bool focused;
@ -5518,7 +5518,7 @@ _efl_ui_widget_efl_ui_focus_object_focus_set(Eo *obj, Elm_Widget_Smart_Data *pd,
efl_ui_focus_object_focus_set(efl_super(obj, MY_CLASS), focus);
efl_ui_widget_on_focus_update(obj);
efl_ui_focus_object_on_focus_update(obj);
}
EOLIAN static Efl_Ui_Focus_Manager*

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

@ -313,10 +313,6 @@ abstract Efl.Ui.Widget (Efl.Canvas.Group, Efl.Access,
return: Efl.Ui.Theme.Apply; [[Indicates success, and if the current
theme or default theme was used.]]
}
on_focus_update @protected {
[[Virtual function handling focus in/out events on the widget]]
return: bool; [[$true if this widget can handle focus, $false otherwise]]
}
/* Scroll API. */
@property on_show_region_hook @protected {

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

@ -1666,9 +1666,9 @@ _elm_win_state_change(Ecore_Evas *ee)
}
EOLIAN static Eina_Bool
_efl_ui_win_efl_ui_widget_on_focus_update(Eo *obj, Efl_Ui_Win_Data *sd)
_efl_ui_win_efl_ui_focus_object_on_focus_update(Eo *obj, Efl_Ui_Win_Data *sd)
{
if (!efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS)))
if (!efl_ui_focus_object_on_focus_update(efl_super(obj, MY_CLASS)))
return EINA_TRUE;
if (sd->img_obj)

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

@ -784,7 +784,7 @@ class Efl.Ui.Win (Efl.Ui.Widget, Efl.Canvas, Efl.Canvas.Pointer, Efl.Access.Wind
Efl.Ui.Widget.focus_highlight_style { get; set; }
Efl.Ui.Widget.focus_highlight_enabled { get; set; }
Efl.Ui.Widget.focus_highlight_animate { get; set; }
Efl.Ui.Widget.on_focus_update;
Efl.Ui.Focus.Object.on_focus_update;
Efl.Ui.Widget.widget_event;
Efl.Ui.Widget.focus_manager_create;
Efl.Access.parent { get; }

1
src/lib/elementary/elementary_config.h
View File

@ -23,4 +23,5 @@
#define EFL_ACCESS_TEXT_BETA
#define EFL_ACCESS_VALUE_BETA
#define EFL_ACCESS_WIDGET_ACTION_BETA
#define EFL_UI_FOCUS_OBJECT_PROTECTED
#endif

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

@ -145,7 +145,7 @@ _elm_access_efl_ui_widget_on_access_activate(Eo *obj, void *_pd EINA_UNUSED, Efl
}
EOLIAN static Eina_Bool
_elm_access_efl_ui_widget_on_focus_update(Eo *obj, void *_pd EINA_UNUSED)
_elm_access_efl_ui_focus_object_on_focus_update(Eo *obj, void *_pd EINA_UNUSED)
{
evas_object_focus_set(obj, efl_ui_focus_object_focus_get(obj));

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

@ -8,7 +8,7 @@ class Elm.Access (Efl.Ui.Widget, Efl.Access.Widget.Action)
class.constructor;
Efl.Object.constructor;
Efl.Ui.Widget.on_access_activate;
Efl.Ui.Widget.on_focus_update;
Efl.Ui.Focus.Object.on_focus_update;
Efl.Access.Widget.Action.elm_actions { get; }
Efl.Access.state_set { get; }
}

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

@ -1386,11 +1386,11 @@ _key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED)
}
EOLIAN static Eina_Bool
_elm_calendar_efl_ui_widget_on_focus_update(Eo *obj, Elm_Calendar_Data *sd)
_elm_calendar_efl_ui_focus_object_on_focus_update(Eo *obj, Elm_Calendar_Data *sd)
{
Eina_Bool int_ret = EINA_FALSE;
int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS));
int_ret = efl_ui_focus_object_on_focus_update(efl_super(obj, MY_CLASS));
if (!int_ret) return EINA_FALSE;
if (efl_ui_focus_object_focus_get(obj))

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

@ -414,7 +414,7 @@ class Elm.Calendar (Efl.Ui.Layout, Efl.Ui.Focus.Composition, Efl.Access.Widget.A
Efl.Canvas.Group.group_calculate;
Efl.Ui.Widget.theme_apply;
Efl.Ui.Widget.on_access_update;
Efl.Ui.Widget.on_focus_update;
Efl.Ui.Focus.Object.on_focus_update;
Efl.Ui.Widget.widget_event;
Efl.Access.Widget.Action.elm_actions { get; }
}

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

@ -897,12 +897,12 @@ _elm_diskselector_efl_ui_widget_widget_sub_object_del(Eo *obj, Elm_Diskselector_
}
EOLIAN static Eina_Bool
_elm_diskselector_efl_ui_widget_on_focus_update(Eo *obj, Elm_Diskselector_Data *_pd EINA_UNUSED)
_elm_diskselector_efl_ui_focus_object_on_focus_update(Eo *obj, Elm_Diskselector_Data *_pd EINA_UNUSED)
{
Eina_Bool int_ret = EINA_FALSE;
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS));
int_ret = efl_ui_focus_object_on_focus_update(efl_super(obj, MY_CLASS));
if (!int_ret) return EINA_FALSE;
if (efl_ui_focus_object_focus_get(obj))

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

@ -203,7 +203,7 @@ class Elm.Diskselector (Efl.Ui.Widget, Elm.Interface_Scrollable,
Efl.Canvas.Group.group_member_add;
Efl.Ui.Widget.on_access_update;
Efl.Ui.Widget.theme_apply;
Efl.Ui.Widget.on_focus_update;
Efl.Ui.Focus.Object.on_focus_update;
Efl.Ui.Translatable.translation_update;
Efl.Ui.Widget.widget_sub_object_del;
Efl.Ui.Widget.widget_event;

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

@ -1301,7 +1301,7 @@ _elm_entry_focus_update(Eo *obj, Elm_Entry_Data *sd)
}
EOLIAN static Eina_Bool
_elm_entry_efl_ui_widget_on_focus_update(Eo *obj, Elm_Entry_Data *sd)
_elm_entry_efl_ui_focus_object_on_focus_update(Eo *obj, Elm_Entry_Data *sd)
{
_elm_entry_focus_update(obj, sd);

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

@ -847,7 +847,7 @@ class Elm.Entry (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
Efl.Layout.Signal.signal_emit;
Efl.Ui.Widget.on_access_activate;
Efl.Ui.Widget.theme_apply;
Efl.Ui.Widget.on_focus_update;
Efl.Ui.Focus.Object.on_focus_update;
Efl.Ui.Widget.interest_region { get; }
Efl.Ui.Widget.on_disabled_update;
Efl.Ui.Widget.widget_sub_object_del;

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

@ -3366,13 +3366,13 @@ _elm_genlist_nearest_visible_item_get(Evas_Object *obj, Elm_Object_Item *eo_it)
}
EOLIAN static Eina_Bool
_elm_genlist_efl_ui_widget_on_focus_update(Eo *obj, Elm_Genlist_Data *sd)
_elm_genlist_efl_ui_focus_object_on_focus_update(Eo *obj, Elm_Genlist_Data *sd)
{
Eina_Bool int_ret = EINA_FALSE;
Elm_Object_Item *eo_it = NULL;
Eina_Bool is_sel = EINA_FALSE;
int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS));
int_ret = efl_ui_focus_object_on_focus_update(efl_super(obj, MY_CLASS));
if (!int_ret) return EINA_FALSE;
if (efl_ui_focus_object_focus_get(obj) && (sd->items) && (sd->selected) &&

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

@ -537,7 +537,7 @@ class Elm.Genlist (Efl.Ui.Layout, Efl.Ui.Focus.Composition, Elm.Interface_Scroll
Efl.Ui.Widget.widget_sub_object_add;
Efl.Ui.Widget.on_access_update;
Efl.Ui.Widget.focus_highlight_geometry { get; }
Efl.Ui.Widget.on_focus_update;
Efl.Ui.Focus.Object.on_focus_update;
Efl.Ui.Widget.widget_sub_object_del;
Efl.Ui.Widget.widget_event;
Efl.Ui.Widget.focused_item { get; }

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_efl_ui_widget_on_focus_update(Eo *obj, Elm_Glview_Data *_pd EINA_UNUSED)
_elm_glview_efl_ui_focus_object_on_focus_update(Eo *obj, Elm_Glview_Data *_pd EINA_UNUSED)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
Eina_Bool int_ret = EINA_FALSE;
int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS));
int_ret = efl_ui_focus_object_on_focus_update(efl_super(obj, MY_CLASS));
if (!int_ret) return EINA_FALSE;
if (efl_ui_focus_object_focus_get(obj))

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

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

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

@ -1236,13 +1236,13 @@ _elm_list_nearest_visible_item_get(Evas_Object *obj, Elm_List_Item_Data *it)
}
EOLIAN static Eina_Bool
_elm_list_efl_ui_widget_on_focus_update(Eo *obj, Elm_List_Data *sd)
_elm_list_efl_ui_focus_object_on_focus_update(Eo *obj, Elm_List_Data *sd)
{
Eina_Bool int_ret = EINA_FALSE;
Elm_Object_Item *eo_it = NULL;
Eina_Bool is_sel = EINA_FALSE;
int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS));
int_ret = efl_ui_focus_object_on_focus_update(efl_super(obj, MY_CLASS));
if (!int_ret) return EINA_FALSE;
if (elm_object_focus_get(obj) && sd->selected && !sd->last_selected_item)

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

@ -437,7 +437,7 @@ class Elm.List (Efl.Ui.Layout, Elm.Interface_Scrollable,
Efl.Ui.Widget.on_access_update;
Efl.Ui.Widget.focus_highlight_geometry { get; }
Efl.Ui.Widget.on_disabled_update;
Efl.Ui.Widget.on_focus_update;
Efl.Ui.Focus.Object.on_focus_update;
Efl.Ui.Translatable.translation_update;
Efl.Ui.Widget.widget_sub_object_del;
Efl.Ui.Widget.widget_event;

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

@ -3945,12 +3945,12 @@ _elm_map_pan_efl_gfx_position_set(Eo *obj, Elm_Map_Pan_Data *_pd EINA_UNUSED, Ei
}
EOLIAN static Eina_Bool
_elm_map_efl_ui_widget_on_focus_update(Eo *obj, Elm_Map_Data *_pd EINA_UNUSED)
_elm_map_efl_ui_focus_object_on_focus_update(Eo *obj, Elm_Map_Data *_pd EINA_UNUSED)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
Eina_Bool int_ret = EINA_FALSE;
int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS));
int_ret = efl_ui_focus_object_on_focus_update(efl_super(obj, MY_CLASS));
if (!int_ret) return EINA_FALSE;
if (efl_ui_focus_object_focus_get(obj))

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

@ -631,7 +631,7 @@ class Elm.Map (Efl.Ui.Widget, Elm.Interface_Scrollable,
Efl.Gfx.size { set; }
Efl.Canvas.Group.group_member_add;
Efl.Ui.Widget.theme_apply;
Efl.Ui.Widget.on_focus_update;
Efl.Ui.Focus.Object.on_focus_update;
Efl.Ui.Widget.widget_event;
Efl.Access.Widget.Action.elm_actions { 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_efl_ui_widget_on_focus_update(Eo *obj, void *sd EINA_UNUSED)
_elm_plug_efl_ui_focus_object_on_focus_update(Eo *obj, void *sd EINA_UNUSED)
{
Eina_Bool int_ret = EINA_FALSE;
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS));
int_ret = efl_ui_focus_object_on_focus_update(efl_super(obj, MY_CLASS));
if (!int_ret) return EINA_FALSE;
if (efl_ui_focus_object_focus_get(obj))

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

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

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

@ -930,11 +930,11 @@ _elm_spinner_elm_layout_sizing_eval(Eo *obj, Elm_Spinner_Data *_pd EINA_UNUSED)
}
EOLIAN static Eina_Bool
_elm_spinner_efl_ui_widget_on_focus_update(Eo *obj, Elm_Spinner_Data *sd)
_elm_spinner_efl_ui_focus_object_on_focus_update(Eo *obj, Elm_Spinner_Data *sd)
{
Eina_Bool int_ret = EINA_FALSE;
int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS));
int_ret = efl_ui_focus_object_on_focus_update(efl_super(obj, MY_CLASS));
if (!int_ret) return EINA_FALSE;
if (!efl_ui_focus_object_focus_get(obj))

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

@ -172,7 +172,7 @@ class Elm.Spinner (Efl.Ui.Layout, Efl.Ui.Range, Efl.Ui.Focus.Composition,
Efl.Object.constructor;
Efl.Ui.Widget.theme_apply;
Efl.Ui.Widget.on_access_update;
Efl.Ui.Widget.on_focus_update;
Efl.Ui.Focus.Object.on_focus_update;
Efl.Ui.Widget.widget_event;
Efl.Ui.Range.range_min_max { get; set; }
Efl.Ui.Range.range_step { get; set; }

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

@ -746,13 +746,13 @@ _elm_toolbar_nearest_visible_item_get(Evas_Object *obj, Elm_Object_Item *eo_it)
}
EOLIAN static Eina_Bool
_elm_toolbar_efl_ui_widget_on_focus_update(Eo *obj, Elm_Toolbar_Data *sd)
_elm_toolbar_efl_ui_focus_object_on_focus_update(Eo *obj, Elm_Toolbar_Data *sd)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
Eina_Bool int_ret = EINA_FALSE;
Elm_Object_Item *eo_it = NULL;
int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS));
int_ret = efl_ui_focus_object_on_focus_update(efl_super(obj, MY_CLASS));
if (!int_ret) return EINA_FALSE;
if (!sd->items) return EINA_FALSE;

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

@ -322,7 +322,7 @@ class Elm.Toolbar (Efl.Ui.Widget, Efl.Ui.Focus.Composition, Elm.Interface_Scroll
Efl.Canvas.Group.group_member_add;
Efl.Ui.Widget.on_access_update;
Efl.Ui.Widget.theme_apply;
Efl.Ui.Widget.on_focus_update;
Efl.Ui.Focus.Object.on_focus_update;
Efl.Ui.Translatable.translation_update;
Efl.Ui.Widget.widget_event;
Efl.Ui.Widget.focus_highlight_geometry { get; }