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

widget: Remove item from on_focus_update 

It's legacy stuff, and always NULL.
This commit is contained in:
Jean-Philippe Andre 2018-01-19 17:13:07 +09:00
parent a465f4d878
commit c35f257bf2
21 changed files with 38 additions and 42 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, Elm_Object_Item *item EINA_UNUSED)
_efl_ui_calendar_efl_ui_widget_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), NULL);
int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS));
if (!int_ret) return EINA_FALSE;
// FIXME : Currently, focused item is same with selected item.

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, Elm_Object_Item *item EINA_UNUSED)
_efl_ui_clock_efl_ui_widget_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), NULL);
int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS));
if (!int_ret) return EINA_FALSE;
if (!efl_ui_focus_object_focus_get(obj))

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, Elm_Object_Item *item EINA_UNUSED)
_efl_ui_image_zoomable_efl_ui_widget_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), NULL);
int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS));
if (!int_ret) return EINA_FALSE;
if (efl_ui_focus_object_focus_get(obj))

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, Elm_Object_Item *item EINA_UNUSED)
_efl_ui_layout_efl_ui_widget_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), item);
efl_ui_widget_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);

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, Elm_Object_Item *item EINA_UNUSED)
_efl_ui_slider_efl_ui_widget_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), NULL);
int_ret = efl_ui_widget_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);

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, Elm_Object_Item *item EINA_UNUSED)
_efl_ui_spin_button_efl_ui_widget_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), NULL);
int_ret = efl_ui_widget_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_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, Elm_Object_Item *item EINA_UNUSED)
_efl_ui_text_efl_ui_widget_on_focus_update(Eo *obj, Efl_Ui_Text_Data *sd)
{
Evas_Object *top;
Eina_Bool top_is_win = EINA_FALSE;

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, NULL);
efl_ui_widget_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, Elm_Object_Item *item EINA_UNUSED)
_efl_ui_widget_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, NULL);
efl_ui_widget_on_focus_update(obj);
}
EOLIAN static Efl_Ui_Focus_Manager*

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

@ -315,10 +315,6 @@ abstract Efl.Ui.Widget (Efl.Canvas.Group, Efl.Access,
}
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!!! */
@in item: Elm.Widget.Item @nullable; [[Widget]]
}
return: bool; [[$true if this widget can handle focus, $false otherwise]]
}

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, Elm_Object_Item *item EINA_UNUSED)
_efl_ui_win_efl_ui_widget_on_focus_update(Eo *obj, Efl_Ui_Win_Data *sd)
{
if (!efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL))
if (!efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS)))
return EINA_TRUE;
if (sd->img_obj)

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_Object_Item *item EINA_UNUSED)
_elm_access_efl_ui_widget_on_focus_update(Eo *obj, void *_pd EINA_UNUSED)
{
evas_object_focus_set(obj, efl_ui_focus_object_focus_get(obj));

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_Object_Item *item EINA_UNUSED)
_elm_calendar_efl_ui_widget_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), NULL);
int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS));
if (!int_ret) return EINA_FALSE;
if (efl_ui_focus_object_focus_get(obj))

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_Object_Item *item EINA_UNUSED)
_elm_diskselector_efl_ui_widget_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), NULL);
int_ret = efl_ui_widget_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_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_Object_Item *item EINA_UNUSED)
_elm_entry_efl_ui_widget_on_focus_update(Eo *obj, Elm_Entry_Data *sd)
{
_elm_entry_focus_update(obj, sd);

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_Object_Item *item EINA_UNUSED)
_elm_genlist_efl_ui_widget_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), NULL);
int_ret = efl_ui_widget_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) &&

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_Object_Item *item EINA_UNUSED)
_elm_glview_efl_ui_widget_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), NULL);
int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS));
if (!int_ret) return EINA_FALSE;
if (efl_ui_focus_object_focus_get(obj))

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_Object_Item *item EINA_UNUSED)
_elm_list_efl_ui_widget_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), NULL);
int_ret = efl_ui_widget_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)

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_Object_Item *item EINA_UNUSED)
_elm_map_efl_ui_widget_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), NULL);
int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS));
if (!int_ret) return EINA_FALSE;
if (efl_ui_focus_object_focus_get(obj))

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_Object_Item *item EINA_UNUSED)
_elm_plug_efl_ui_widget_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), NULL);
int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS));
if (!int_ret) return EINA_FALSE;
if (efl_ui_focus_object_focus_get(obj))

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_Object_Item *item EINA_UNUSED)
_elm_spinner_efl_ui_widget_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), NULL);
int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS));
if (!int_ret) return EINA_FALSE;
if (!efl_ui_focus_object_focus_get(obj))

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_Object_Item *item EINA_UNUSED)
_elm_toolbar_efl_ui_widget_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), NULL);
int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS));
if (!int_ret) return EINA_FALSE;
if (!sd->items) return EINA_FALSE;