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

widget: Rename EO APIs to efl_ui_widget_xxx 

This only changes the eo_prefix for APIs.

Ref T5363
This commit is contained in:
Jean-Philippe Andre 2017-10-24 14:03:46 +09:00
parent bcb24a40dc
commit 2f465e1fbb
68 changed files with 184 additions and 184 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -124,7 +124,7 @@ _efl_ui_bg_efl_object_constructor(Eo *obj, Efl_Ui_Bg_Data *_pd EINA_UNUSED)
obj = efl_constructor(efl_super(obj, MY_CLASS));
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
elm_obj_widget_focus_allow_set(obj, EINA_FALSE);
efl_ui_widget_focus_allow_set(obj, EINA_FALSE);
return obj;
}

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

@ -125,7 +125,7 @@ _efl_ui_button_elm_widget_theme_apply(Eo *obj, Efl_Ui_Button_Data *_pd EINA_UNUS
{
Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
_icon_signal_emit(obj);

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

@ -156,7 +156,7 @@ _efl_ui_check_elm_widget_theme_apply(Eo *obj, Efl_Ui_Check_Data *sd EINA_UNUSED)
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED);
int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;

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

@ -451,7 +451,7 @@ _efl_ui_clock_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Clock_Data *sd, Elm_Obj
{
Eina_Bool int_ret = EINA_FALSE;
int_ret = elm_obj_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL);
int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL);
if (!int_ret) return EINA_FALSE;
if (!elm_widget_focus_get(obj))
@ -469,7 +469,7 @@ _efl_ui_clock_elm_widget_on_disabled_update(Eo *obj, Efl_Ui_Clock_Data *sd, Eina
Clock_Field *field;
unsigned int idx = 0;
if (!elm_obj_widget_on_disabled_update(efl_super(obj, MY_CLASS), disabled))
if (!efl_ui_widget_on_disabled_update(efl_super(obj, MY_CLASS), disabled))
return EINA_FALSE;
for (idx = 0; idx < EFL_UI_CLOCK_TYPE_COUNT; idx++)
@ -509,7 +509,7 @@ _efl_ui_clock_elm_widget_theme_apply(Eo *obj, Efl_Ui_Clock_Data *sd)
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
if ((!dt_mod) || (!dt_mod->field_value_display)) return EINA_TRUE;

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

@ -101,7 +101,7 @@ EOLIAN static Efl_Ui_Theme_Apply
_efl_ui_flip_elm_widget_theme_apply(Eo *obj, Efl_Ui_Flip_Data *sd EINA_UNUSED)
{
Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
_sizing_eval(obj);

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

@ -136,7 +136,7 @@ _efl_ui_focus_composition_elm_widget_focus_state_apply(Eo *obj, Efl_Ui_Focus_Com
configured_state->parent == current_state.parent)
return !!current_state.manager;
registered = elm_obj_widget_focus_state_apply(efl_super(obj, MY_CLASS), current_state, configured_state, redirect);
registered = efl_ui_widget_focus_state_apply(efl_super(obj, MY_CLASS), current_state, configured_state, redirect);
if (registered)
pd->registered = configured_state->manager;

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

@ -73,7 +73,7 @@ _efl_ui_focus_layer_elm_widget_focus_state_apply(Eo *obj EINA_UNUSED, Efl_Ui_Foc
EOLIAN static Efl_Object*
_efl_ui_focus_layer_efl_object_constructor(Eo *obj, Efl_Ui_Focus_Layer_Data *pd)
{
pd->manager = elm_obj_widget_focus_manager_create(obj, obj);
pd->manager = efl_ui_widget_focus_manager_create(obj, obj);
efl_composite_attach(obj, pd->manager);

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

@ -32,7 +32,7 @@ EOLIAN static Efl_Ui_Theme_Apply
_efl_ui_grid_elm_widget_theme_apply(Eo *obj, Efl_Ui_Grid_Data *pd EINA_UNUSED)
{
Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
_mirrored_set(obj, efl_ui_mirrored_get(obj));
@ -153,7 +153,7 @@ _efl_ui_grid_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Grid_Data *pd)
elm_widget_can_focus_set(obj, EINA_FALSE);
elm_widget_highlight_ignore_set(obj, EINA_FALSE);
elm_obj_widget_theme_apply(obj);
efl_ui_widget_theme_apply(obj);
}
EOLIAN static void

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

@ -728,7 +728,7 @@ _efl_ui_image_elm_widget_theme_apply(Eo *obj, Efl_Ui_Image_Data *sd EINA_UNUSED)
if (sd->stdicon)
_elm_theme_object_icon_set(obj, sd->stdicon, elm_widget_style_get(obj));
int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
_efl_ui_image_sizing_eval(obj);

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

@ -866,7 +866,7 @@ _efl_ui_image_zoomable_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Image_Zoomable
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
Eina_Bool int_ret = EINA_FALSE;
int_ret = elm_obj_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL);
int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL);
if (!int_ret) return EINA_FALSE;
if (elm_widget_focus_get(obj))
@ -894,7 +894,7 @@ _efl_ui_image_zoomable_elm_widget_theme_apply(Eo *obj, Efl_Ui_Image_Zoomable_Dat
if (sd->stdicon)
_internal_efl_ui_image_zoomable_icon_set(obj, sd->stdicon, &fdo, EINA_TRUE);
int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
_sizing_eval(obj);

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

@ -325,7 +325,7 @@ _visuals_refresh(Evas_Object *obj,
_efl_ui_layout_highlight_in_theme(obj);
ret = elm_obj_widget_on_disabled_update(obj, elm_widget_disabled_get(obj));
ret = efl_ui_widget_on_disabled_update(obj, elm_widget_disabled_get(obj));
elm_layout_sizing_eval(obj);
@ -378,7 +378,7 @@ _efl_ui_layout_elm_widget_theme_apply(Eo *obj, Efl_Ui_Layout_Data *sd)
{
Efl_Ui_Theme_Apply theme_apply = EFL_UI_THEME_APPLY_FAILED;
theme_apply = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
theme_apply = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
if (!theme_apply) return EFL_UI_THEME_APPLY_FAILED;
theme_apply &= _efl_ui_layout_theme_internal(obj, sd);

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

@ -121,7 +121,7 @@ _efl_ui_nstate_elm_widget_theme_apply(Eo *obj, Efl_Ui_Nstate_Data *pd)
{
Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
_state_active(obj, pd);

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

@ -71,7 +71,7 @@ _efl_ui_panes_elm_widget_theme_apply(Eo *obj, Efl_Ui_Panes_Data *sd)
elm_coords_finger_size_adjust(1, &minw, 1, &minh);
evas_object_size_hint_min_set(sd->event, minw, minh);
int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
size = elm_panes_content_left_size_get(obj);
@ -434,7 +434,7 @@ _efl_ui_panes_efl_ui_direction_direction_set(Eo *obj, Efl_Ui_Panes_Data *sd, Efl
dir = EFL_UI_DIR_VERTICAL;
sd->dir = dir;
elm_obj_widget_theme_apply(obj);
efl_ui_widget_theme_apply(obj);
if (elm_widget_is_legacy(obj)) _update_fixed_sides(obj);
else _set_min_size_new(obj);

10
src/lib/elementary/efl_ui_progressbar.c
View File

@ -177,7 +177,7 @@ _icon_signal_emit(Evas_Object *obj)
EOLIAN static Eina_Bool
_efl_ui_progressbar_elm_widget_widget_sub_object_del(Eo *obj, Efl_Ui_Progressbar_Data *pd EINA_UNUSED, Evas_Object *sobj)
{
if (!elm_obj_widget_sub_object_del(efl_super(obj, MY_CLASS), sobj))
if (!efl_ui_widget_sub_object_del(efl_super(obj, MY_CLASS), sobj))
return EINA_FALSE;
_icon_signal_emit(obj);
@ -187,7 +187,7 @@ _efl_ui_progressbar_elm_widget_widget_sub_object_del(Eo *obj, Efl_Ui_Progressbar
static Eina_Bool
_efl_ui_progressbar_elm_widget_widget_sub_object_add(Eo *obj, Efl_Ui_Progressbar_Data *pd EINA_UNUSED, Evas_Object *sobj)
{
if (!elm_obj_widget_sub_object_add(efl_super(obj, MY_CLASS), sobj))
if (!efl_ui_widget_sub_object_add(efl_super(obj, MY_CLASS), sobj))
return EINA_FALSE;
_icon_signal_emit(obj);
@ -205,7 +205,7 @@ _efl_ui_progressbar_elm_widget_theme_apply(Eo *obj, Efl_Ui_Progressbar_Data *sd)
eina_stringshare_replace(&ld->group, "horizontal");
else eina_stringshare_replace(&ld->group, "vertical");
int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
if (sd->pulse)
@ -366,7 +366,7 @@ _efl_ui_progressbar_pulse_mode_set(Eo *obj EINA_UNUSED, Efl_Ui_Progressbar_Data
sd->pulse = pulse;
elm_obj_widget_theme_apply(obj);
efl_ui_widget_theme_apply(obj);
}
EOLIAN static Eina_Bool
@ -380,7 +380,7 @@ _efl_ui_progressbar_efl_ui_direction_direction_set(Eo *obj, Efl_Ui_Progressbar_D
{
sd->dir = dir;
elm_obj_widget_theme_apply(obj);
efl_ui_widget_theme_apply(obj);
}
EOLIAN static Efl_Ui_Dir

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

@ -151,7 +151,7 @@ _efl_ui_radio_elm_widget_theme_apply(Eo *obj, Efl_Ui_Radio_Data *sd)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED);
Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
int_ret = elm_obj_widget_theme_apply(efl_super(obj, EFL_UI_CHECK_CLASS));
int_ret = efl_ui_widget_theme_apply(efl_super(obj, EFL_UI_CHECK_CLASS));
if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
if (sd->state) elm_layout_signal_emit(obj, "elm,state,radio,on", "elm");

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

@ -771,7 +771,7 @@ _efl_ui_slider_elm_widget_theme_apply(Eo *obj, Efl_Ui_Slider_Data *sd)
elm_widget_style_get(obj));
}
int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
if (sd->popup)
@ -1223,7 +1223,7 @@ _efl_ui_slider_efl_ui_direction_direction_set(Eo *obj, Efl_Ui_Slider_Data *sd, E
{
sd->dir = dir;
elm_obj_widget_theme_apply(obj);
efl_ui_widget_theme_apply(obj);
}
EOLIAN static Efl_Ui_Dir
@ -1372,7 +1372,7 @@ _efl_ui_slider_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Slider_Data *sd EINA_U
{
Eina_Bool int_ret = EINA_FALSE;
int_ret = elm_obj_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL);
int_ret = efl_ui_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);
@ -1614,7 +1614,7 @@ elm_slider_range_enabled_set(Evas_Object *obj, Eina_Bool enable)
if (sd->intvl_enable == enable) return;
sd->intvl_enable = enable;
elm_obj_widget_theme_apply(obj);
efl_ui_widget_theme_apply(obj);
if (sd->intvl_enable)
{
elm_layout_signal_emit(obj, "elm,slider,range,enable", "elm");

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

@ -111,7 +111,7 @@ _efl_ui_slider_interval_efl_object_finalize(Eo *obj, Efl_Ui_Slider_Interval_Data
pd->intvl_enable = EINA_TRUE;
elm_obj_widget_theme_apply(obj);
efl_ui_widget_theme_apply(obj);
elm_layout_signal_emit(obj, "elm,slider,range,enable", "elm");
if (pd->indicator_show)

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

@ -916,7 +916,7 @@ _efl_ui_text_elm_widget_theme_apply(Eo *obj, Efl_Ui_Text_Data *sd)
// Note: We are skipping elm_layout here! This is by design.
// This assumes the following inheritance: my_class -> layout -> widget ...
theme_apply = elm_obj_widget_theme_apply(efl_cast(obj, ELM_WIDGET_CLASS));
theme_apply = efl_ui_widget_theme_apply(efl_cast(obj, ELM_WIDGET_CLASS));
if (!theme_apply) return EFL_UI_THEME_APPLY_FAILED;
efl_event_freeze(obj);
@ -2141,7 +2141,7 @@ _entry_changed_handle(void *data,
if (sd->single_line != single_line)
{
sd->single_line = single_line;
elm_obj_widget_theme_apply(data);
efl_ui_widget_theme_apply(data);
}
elm_layout_sizing_eval(data);
@ -3429,7 +3429,7 @@ _efl_ui_text_password_set(Eo *obj, Efl_Ui_Text_Data *sd, Eina_Bool password)
efl_access_role_set(obj, EFL_ACCESS_ROLE_ENTRY);
}
elm_obj_widget_theme_apply(obj);
efl_ui_widget_theme_apply(obj);
}
EOLIAN static Eina_Bool
@ -3485,7 +3485,7 @@ _efl_ui_text_efl_ui_text_interactive_editable_set(Eo *obj, Efl_Ui_Text_Data *sd,
efl_ui_text_interactive_editable_set(efl_super(obj, MY_CLASS), editable);
if (sd->editable == editable) return;
sd->editable = editable;
elm_obj_widget_theme_apply(obj);
efl_ui_widget_theme_apply(obj);
elm_drop_target_del(obj, sd->drop_format,
_dnd_enter_cb, NULL,
@ -3799,7 +3799,7 @@ _efl_ui_text_scrollable_set(Eo *obj, Efl_Ui_Text_Data *sd, Eina_Bool scroll)
elm_widget_on_show_region_hook_set(obj, NULL, NULL, NULL);
}
_update_decorations(obj);
elm_obj_widget_theme_apply(obj);
efl_ui_widget_theme_apply(obj);
}
EOLIAN static Eina_Bool

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

@ -542,7 +542,7 @@ _efl_ui_textpath_elm_widget_theme_apply(Eo *obj, Efl_Ui_Textpath_Data *pd)
{
Efl_Ui_Theme_Apply ret = EFL_UI_THEME_APPLY_FAILED;
ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
if (!ret) return EFL_UI_THEME_APPLY_FAILED;
elm_widget_theme_object_set(obj, pd->text_obj, "textpath", "base",

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

@ -1231,7 +1231,7 @@ _elm_win_focus_in(Ecore_Evas *ee)
}
Evas_Object *focused = efl_ui_focus_manager_focus_get(man);
elm_obj_widget_on_focus_update(focused, NULL);
efl_ui_widget_on_focus_update(focused, NULL);
}
evas_object_smart_callback_call(obj, SIG_FOCUS_IN, NULL);
@ -1618,7 +1618,7 @@ _elm_win_state_change(Ecore_Evas *ee)
_elm_win_xwin_update(sd);
#endif
ELM_WIN_DATA_ALIVE_CHECK(obj, sd);
elm_obj_widget_on_orientation_update(obj, sd->rot);
efl_ui_widget_on_orientation_update(obj, sd->rot);
efl_event_callback_legacy_call
(obj, EFL_UI_WIN_EVENT_ROTATION_CHANGED, NULL);
efl_event_callback_legacy_call
@ -1629,7 +1629,7 @@ _elm_win_state_change(Ecore_Evas *ee)
EOLIAN static Eina_Bool
_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_update(efl_super(obj, MY_CLASS), NULL))
if (!efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL))
return EINA_TRUE;
if (sd->img_obj)
@ -5369,7 +5369,7 @@ _efl_ui_win_efl_object_constructor(Eo *obj, Efl_Ui_Win_Data *pd)
* really bad and hacky. Needs fixing. */
pd->obj = obj;
pd->manager = elm_obj_widget_focus_manager_create(obj, obj);
pd->manager = efl_ui_widget_focus_manager_create(obj, obj);
pd->provider = efl_add(EFL_UI_FOCUS_PARENT_PROVIDER_STANDARD_CLASS, obj);
pd->profile.available = eina_array_new(4);
@ -6084,7 +6084,7 @@ _win_rotate(Evas_Object *obj, Efl_Ui_Win_Data *sd, int rotation, Eina_Bool resiz
_elm_win_xwin_update(sd);
#endif
_elm_win_frame_obj_update(sd);
elm_obj_widget_on_orientation_update(obj, rotation);
efl_ui_widget_on_orientation_update(obj, rotation);
efl_event_callback_legacy_call
(obj, EFL_UI_WIN_EVENT_ROTATION_CHANGED, NULL);
}
@ -6352,7 +6352,7 @@ _elm_win_theme_internal(Eo *obj, Efl_Ui_Win_Data *sd)
efl_ui_scale_get(obj) * elm_config_scale_get());
efl_event_callback_legacy_call(obj, EFL_UI_WIN_EVENT_THEME_CHANGED, NULL);
ret = elm_obj_widget_on_disabled_update(obj, elm_widget_disabled_get(obj));
ret = efl_ui_widget_on_disabled_update(obj, elm_widget_disabled_get(obj));
if (!ret) int_ret = EFL_UI_THEME_APPLY_FAILED;
@ -6369,7 +6369,7 @@ EOLIAN static Efl_Ui_Theme_Apply
_efl_ui_win_elm_widget_theme_apply(Eo *obj, Efl_Ui_Win_Data *sd)
{
Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
sd->focus_highlight.theme_changed = EINA_TRUE;
@ -8208,7 +8208,7 @@ elm_win_socket_listen(Efl_Ui_Win *obj, const char *svcname, int svcnum, Eina_Boo
EAPI Eina_Bool
elm_win_focus_get(const Efl_Ui_Win *obj)
{
return elm_obj_widget_focus_get(obj);
return efl_ui_widget_focus_get(obj);
}
EAPI void
@ -8232,19 +8232,19 @@ elm_win_focus_highlight_enabled_get(const Efl_Ui_Win *obj)
EAPI void
elm_win_focus_highlight_enabled_set(Efl_Ui_Win *obj, Eina_Bool enabled)
{
elm_obj_widget_focus_highlight_enabled_set(obj, enabled);
efl_ui_widget_focus_highlight_enabled_set(obj, enabled);
}
EAPI void
elm_win_focus_highlight_animate_set(Elm_Win *obj, Eina_Bool animate)
{
elm_obj_widget_focus_highlight_animate_set(obj, animate);
efl_ui_widget_focus_highlight_animate_set(obj, animate);
}
EAPI Eina_Bool
elm_win_focus_highlight_animate_get(const Elm_Win *obj)
{
return elm_obj_widget_focus_highlight_animate_get(obj);
return efl_ui_widget_focus_highlight_animate_get(obj);
}
EAPI Eina_Bool

10
src/lib/elementary/elc_combobox.c
View File

@ -73,7 +73,7 @@ _elm_combobox_elm_widget_theme_apply(Eo *obj, Elm_Combobox_Data *sd)
/* combobox's style has no extra bit for orientation but could have... */
eina_stringshare_replace(&(wd->style), buf);
int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
eina_stringshare_replace(&(wd->style), style);
@ -295,7 +295,7 @@ _elm_combobox_efl_canvas_group_group_add(Eo *obj, Elm_Combobox_Data *sd EINA_UNU
efl_event_callback_add(obj, EFL_UI_EVENT_CLICKED, _on_clicked, obj);
//What are you doing here?
elm_obj_widget_theme_apply(obj);
efl_ui_widget_theme_apply(obj);
}
EOLIAN static void
@ -368,7 +368,7 @@ _elm_combobox_efl_object_constructor(Eo *obj, Elm_Combobox_Data *sd)
//hover
sd->hover = efl_add(ELM_HOVER_CLASS, sd->hover_parent,
_hover_ctor(obj, efl_added),
elm_obj_widget_style_set(efl_added, buf));
efl_ui_widget_style_set(efl_added, buf));
evas_object_layer_set(sd->hover, EVAS_LAYER_MAX);
efl_ui_mirrored_automatic_set(sd->hover, EINA_FALSE);
elm_hover_target_set(sd->hover, obj);
@ -393,7 +393,7 @@ _elm_combobox_efl_object_constructor(Eo *obj, Elm_Combobox_Data *sd)
// This is the genlist object that will take over the genlist call
sd->genlist = gl = efl_add(ELM_GENLIST_CLASS, obj,
elm_obj_widget_style_set(efl_added, buf));
efl_ui_widget_style_set(efl_added, buf));
elm_genlist_filter_set(gl, NULL);
efl_ui_mirrored_automatic_set(gl, EINA_FALSE);
efl_ui_mirrored_set(gl, efl_ui_mirrored_get(obj));
@ -408,7 +408,7 @@ _elm_combobox_efl_object_constructor(Eo *obj, Elm_Combobox_Data *sd)
// This is the entry object that will take over the entry call
sd->entry = entry = efl_add(ELM_ENTRY_CLASS, obj,
elm_obj_widget_style_set(efl_added, buf));
efl_ui_widget_style_set(efl_added, buf));
efl_ui_mirrored_automatic_set(entry, EINA_FALSE);
efl_ui_mirrored_set(entry, efl_ui_mirrored_get(obj));
elm_scroller_policy_set(entry, ELM_SCROLLER_POLICY_OFF,

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

@ -656,7 +656,7 @@ _elm_ctxpopup_elm_widget_theme_apply(Eo *obj, Elm_Ctxpopup_Data *sd)
{
Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
elm_widget_theme_object_set
@ -1014,7 +1014,7 @@ _elm_ctxpopup_item_efl_object_destructor(Eo *eo_ctxpopup_it,
EOLIAN static Eina_Bool
_elm_ctxpopup_elm_widget_on_disabled_update(Eo *obj, Elm_Ctxpopup_Data *sd, Eina_Bool disabled)
{
if (!elm_obj_widget_on_disabled_update(efl_super(obj, MY_CLASS), disabled))
if (!efl_ui_widget_on_disabled_update(efl_super(obj, MY_CLASS), disabled))
return EINA_FALSE;
if (sd->list)

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

@ -235,7 +235,7 @@ _elm_fileselector_elm_widget_theme_apply(Eo *obj, Elm_Fileselector_Data *sd)
char buf[1024];
Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
style = elm_widget_style_get(obj);
@ -2393,7 +2393,7 @@ _elm_fileselector_elm_interface_fileselector_mode_set(Eo *obj, Elm_Fileselector_
sd->mode = mode;
elm_obj_widget_theme_apply(obj);
efl_ui_widget_theme_apply(obj);
if (sd->model)
{
_schedule_populate(obj, sd, sd->model, NULL);
@ -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)
{
Eina_Bool ret = elm_obj_widget_focus_state_apply(efl_super(obj, MY_CLASS), current_state, configured_state, redirect);
Eina_Bool ret = efl_ui_widget_focus_state_apply(efl_super(obj, MY_CLASS), current_state, configured_state, redirect);
_focus_chain_update(obj, pd);

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

@ -59,7 +59,7 @@ _elm_fileselector_button_elm_widget_theme_apply(Eo *obj, Elm_Fileselector_Button
/* file selector button's style has an extra bit */
eina_stringshare_replace(&(wd->style), buf);
int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
eina_stringshare_replace(&(wd->style), style);
@ -232,7 +232,7 @@ _elm_fileselector_button_efl_canvas_group_group_add(Eo *obj, Elm_Fileselector_Bu
efl_event_callback_add(obj, EFL_UI_EVENT_CLICKED, _button_clicked, priv);
elm_obj_widget_theme_apply(obj);
efl_ui_widget_theme_apply(obj);
elm_widget_can_focus_set(obj, EINA_TRUE);
}

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

@ -168,7 +168,7 @@ _elm_fileselector_entry_elm_widget_theme_apply(Eo *obj, Elm_Fileselector_Entry_D
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED);
Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
style = elm_widget_style_get(obj);
@ -193,7 +193,7 @@ _elm_fileselector_entry_elm_widget_theme_apply(Eo *obj, Elm_Fileselector_Entry_D
EOLIAN static Eina_Bool
_elm_fileselector_entry_elm_widget_on_disabled_update(Eo *obj, Elm_Fileselector_Entry_Data *sd, Eina_Bool disabled)
{
if (!elm_obj_widget_on_disabled_update(efl_super(obj, MY_CLASS), disabled))
if (!efl_ui_widget_on_disabled_update(efl_super(obj, MY_CLASS), disabled))
return EINA_FALSE;
elm_widget_disabled_set(sd->button, disabled);

8
src/lib/elementary/elc_hoversel.c
View File

@ -83,7 +83,7 @@ _elm_hoversel_elm_widget_theme_apply(Eo *obj, Elm_Hoversel_Data *sd)
/* hoversel's style has an extra bit: orientation */
eina_stringshare_replace(&(wd->style), buf);
int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
eina_stringshare_replace(&(wd->style), style);
@ -630,7 +630,7 @@ _elm_hoversel_efl_canvas_group_group_add(Eo *obj, Elm_Hoversel_Data *pd)
efl_event_callback_add(obj, EFL_UI_EVENT_CLICKED, _on_clicked, obj);
//What are you doing here?
elm_obj_widget_theme_apply(obj);
efl_ui_widget_theme_apply(obj);
evas_object_event_callback_add(obj, EVAS_CALLBACK_MOVE, _on_geometry_changed, pd);
evas_object_event_callback_add(obj, EVAS_CALLBACK_RESIZE, _on_geometry_changed, pd);
@ -752,7 +752,7 @@ _elm_hoversel_horizontal_set(Eo *obj, Elm_Hoversel_Data *sd, Eina_Bool horizonta
}
}
elm_obj_widget_theme_apply(obj);
efl_ui_widget_theme_apply(obj);
}
EOLIAN static Eina_Bool
@ -1004,7 +1004,7 @@ ELM_WIDGET_KEY_DOWN_DEFAULT_IMPLEMENT(hoversel, Elm_Hoversel_Data)
EOLIAN static Eina_Bool
_elm_hoversel_elm_widget_widget_event(Eo *obj, Elm_Hoversel_Data *sd, const Efl_Event *eo_event, Evas_Object *src)
{
if (elm_obj_widget_event(efl_super(obj, MY_CLASS), eo_event, src))
if (efl_ui_widget_event(efl_super(obj, MY_CLASS), eo_event, src))
return EINA_TRUE; // note: this was FALSE but likely wrong
return _hoversel_elm_widget_widget_event(obj, sd, eo_event, src);

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

@ -95,7 +95,7 @@ _elm_multibuttonentry_elm_widget_theme_apply(Eo *obj, Elm_Multibuttonentry_Data
double pad_scale;
Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
str = elm_layout_data_get(obj, "horizontal_pad");

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

@ -74,7 +74,7 @@ _elm_naviframe_elm_widget_resize_object_set(Eo *obj, Elm_Naviframe_Data *pd EINA
wd->resize_obj = NULL;
super:
elm_obj_widget_resize_object_set(efl_super(obj, MY_CLASS), sobj);
efl_ui_widget_resize_object_set(efl_super(obj, MY_CLASS), sobj);
}
static void
@ -397,11 +397,11 @@ _elm_naviframe_elm_widget_theme_apply(Eo *obj, Elm_Naviframe_Data *sd)
Elm_Naviframe_Item_Data *it;
const char *style = NULL, *sstyle = NULL;
style = elm_obj_widget_style_get(obj);
style = efl_ui_widget_style_get(obj);
EINA_INLIST_FOREACH(sd->stack, it)
{
sstyle = elm_obj_widget_style_get(VIEW(it));
sstyle = efl_ui_widget_style_get(VIEW(it));
if ((style && sstyle) && strcmp(style, sstyle))
_item_style_set(it, it->style);
_item_signals_emit(it);

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

@ -188,7 +188,7 @@ EOLIAN static Efl_Ui_Theme_Apply
_elm_player_elm_widget_theme_apply(Eo *obj, Elm_Player_Data *sd)
{
Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
_update_theme_button(obj, sd->forward, "forward");

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

@ -122,7 +122,7 @@ _elm_actionslider_elm_widget_theme_apply(Eo *obj, Elm_Actionslider_Data *sd EINA
mirrored = elm_object_mirrored_get(obj);
int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
if (elm_object_mirrored_get(obj) != mirrored)

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

@ -53,7 +53,7 @@ _elm_box_elm_widget_theme_apply(Eo *obj, Elm_Box_Data *sd EINA_UNUSED)
{
Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED);

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

@ -215,7 +215,7 @@ _elm_bubble_pos_set(Eo *obj, Elm_Bubble_Data *sd, Elm_Bubble_Pos pos)
eina_stringshare_replace
(&ld->group, corner_string[sd->pos]);
elm_obj_widget_theme_apply(obj);
efl_ui_widget_theme_apply(obj);
}
EOLIAN static Elm_Bubble_Pos

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

@ -907,7 +907,7 @@ _elm_calendar_elm_widget_theme_apply(Eo *obj, Elm_Calendar_Data *sd)
{
Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
_spinner_buttons_add(obj, sd);
@ -1434,7 +1434,7 @@ _elm_calendar_elm_widget_on_focus_update(Eo *obj, Elm_Calendar_Data *sd, Elm_Obj
{
Eina_Bool int_ret = EINA_FALSE;
int_ret = elm_obj_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL);
int_ret = efl_ui_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_clock.c
View File

@ -609,7 +609,7 @@ _elm_clock_elm_widget_theme_apply(Eo *obj, Elm_Clock_Data *sd EINA_UNUSED)
{
Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
_time_update(obj, EINA_TRUE);

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

@ -1329,7 +1329,7 @@ _elm_colorselector_elm_widget_theme_apply(Eo *obj, Elm_Colorselector_Data *sd)
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED);
Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
if ((sd->mode == ELM_COLORSELECTOR_PALETTE) ||

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

@ -574,7 +574,7 @@ _elm_conformant_elm_widget_theme_apply(Eo *obj, Elm_Conformant_Data *_pd EINA_UN
{
Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
_conformant_parts_swallow(obj);

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

@ -131,7 +131,7 @@ _elm_dayselector_elm_widget_theme_apply(Eo *obj, Elm_Dayselector_Data *sd)
char buf[1024];
Elm_Dayselector_Item_Data *it;
int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
EINA_LIST_FOREACH(sd->items, l, it)

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

@ -821,7 +821,7 @@ _elm_diskselector_elm_widget_theme_apply(Eo *obj, Elm_Diskselector_Data *sd)
Evas *evas;
const char *style = elm_widget_style_get(obj);
int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
evas = evas_object_evas_get(obj);
@ -902,7 +902,7 @@ _elm_diskselector_elm_widget_on_focus_update(Eo *obj, Elm_Diskselector_Data *_pd
Eina_Bool int_ret = EINA_FALSE;
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
int_ret = elm_obj_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL);
int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL);
if (!int_ret) return EINA_FALSE;
if (elm_widget_focus_get(obj))
@ -1248,7 +1248,7 @@ _elm_diskselector_efl_canvas_group_group_add(Eo *obj, Elm_Diskselector_Data *pri
priv->len_side = 3;
elm_interface_scrollable_objects_set(obj, edje, priv->hit_rect);
elm_obj_widget_theme_apply(obj);
efl_ui_widget_theme_apply(obj);
elm_interface_scrollable_policy_set(obj, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
elm_interface_scrollable_bounce_allow_set(obj, EINA_TRUE, EINA_FALSE);
elm_interface_scrollable_animate_start_cb_set(obj, _scroll_animate_start_cb);

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

@ -863,7 +863,7 @@ _elm_entry_elm_widget_theme_apply(Eo *obj, Elm_Entry_Data *sd)
// Note: We are skipping elm_layout here! This is by design.
// This assumes the following inheritance: my_class -> layout -> widget ...
theme_apply = elm_obj_widget_theme_apply(efl_cast(obj, ELM_WIDGET_CLASS));
theme_apply = efl_ui_widget_theme_apply(efl_cast(obj, ELM_WIDGET_CLASS));
if (!theme_apply) return EFL_UI_THEME_APPLY_FAILED;
evas_event_freeze(evas_object_evas_get(obj));
@ -4047,7 +4047,7 @@ EOLIAN static void
_elm_entry_text_style_user_push(Eo *obj, Elm_Entry_Data *sd, const char *style)
{
edje_object_part_text_style_user_push(sd->entry_edje, "elm.text", style);
elm_obj_widget_theme_apply(obj);
efl_ui_widget_theme_apply(obj);
}
EOLIAN static void
@ -4055,7 +4055,7 @@ _elm_entry_text_style_user_pop(Eo *obj, Elm_Entry_Data *sd)
{
edje_object_part_text_style_user_pop(sd->entry_edje, "elm.text");
elm_obj_widget_theme_apply(obj);
efl_ui_widget_theme_apply(obj);
}
EOLIAN static const char*
@ -4082,7 +4082,7 @@ _elm_entry_single_line_set(Eo *obj, Elm_Entry_Data *sd, Eina_Bool single_line)
{
elm_entry_markup_filter_remove(obj, _entry_new_line_filter_cb, NULL);
}
elm_obj_widget_theme_apply(obj);
efl_ui_widget_theme_apply(obj);
if (sd->scroll)
{
@ -4137,7 +4137,7 @@ _elm_entry_password_set(Eo *obj, Elm_Entry_Data *sd, Eina_Bool password)
efl_access_role_set(obj, EFL_ACCESS_ROLE_ENTRY);
}
elm_obj_widget_theme_apply(obj);
efl_ui_widget_theme_apply(obj);
}
EOLIAN static Eina_Bool
@ -4237,7 +4237,7 @@ _elm_entry_line_wrap_set(Eo *obj, Elm_Entry_Data *sd, Elm_Wrap_Type wrap)
sd->line_wrap = wrap;
if (wrap == ELM_WRAP_NONE)
ELM_SAFE_FREE(sd->deferred_recalc_job, ecore_job_del);
elm_obj_widget_theme_apply(obj);
efl_ui_widget_theme_apply(obj);
}
EOLIAN static Elm_Wrap_Type
@ -4251,7 +4251,7 @@ _elm_entry_editable_set(Eo *obj, Elm_Entry_Data *sd, Eina_Bool editable)
{
if (sd->editable == editable) return;
sd->editable = editable;
elm_obj_widget_theme_apply(obj);
efl_ui_widget_theme_apply(obj);
_elm_entry_focus_update(obj, sd);
elm_drop_target_del(obj, sd->drop_format,
@ -5049,7 +5049,7 @@ _elm_entry_scrollable_set(Eo *obj, Elm_Entry_Data *sd, Eina_Bool scroll)
elm_widget_on_show_region_hook_set(obj, NULL, NULL, NULL);
}
sd->last_w = -1;
elm_obj_widget_theme_apply(obj);
efl_ui_widget_theme_apply(obj);
}
EOLIAN static Eina_Bool

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

@ -76,7 +76,7 @@ _focus_next_hook(const Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **
if ((!wd) || (!wd->content)) return EINA_FALSE;
cur = wd->content;
return elm_obj_widget_focus_next_get(cur, dir, next);
return efl_ui_widget_focus_next_get(cur, dir, next);
}
static void
@ -293,7 +293,7 @@ elm_factory_add(Evas_Object *parent)
elm_widget_sub_object_add(parent, obj);
elm_widget_data_set(obj, wd);
elm_widget_del_hook_set(obj, _del_hook);
elm_obj_widget_focus_next_hook_set(obj, _focus_next_hook);
efl_ui_widget_focus_next_hook_set(obj, _focus_next_hook);
elm_widget_content_set_hook_set(obj, _content_set_hook);
elm_widget_content_get_hook_set(obj, _content_get_hook);
elm_widget_content_unset_hook_set(obj, _content_unset_hook);

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

@ -358,7 +358,7 @@ _elm_flipselector_elm_widget_theme_apply(Eo *obj, Elm_Flipselector_Data *sd)
Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED);
int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
max_len = edje_object_data_get(wd->resize_obj, "max_len");
@ -631,7 +631,7 @@ _elm_flipselector_efl_canvas_group_group_add(Eo *obj, Elm_Flipselector_Data *pri
elm_widget_can_focus_set(obj, EINA_TRUE);
elm_obj_widget_theme_apply(obj);
efl_ui_widget_theme_apply(obj);
}
EOLIAN static void

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

@ -3501,7 +3501,7 @@ _elm_gengrid_elm_widget_on_focus_update(Eo *obj, Elm_Gengrid_Data *sd, Elm_Objec
Eina_Bool int_ret = EINA_FALSE;
Elm_Object_Item *eo_it = NULL;
int_ret = elm_obj_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL);
int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL);
if (!int_ret) return EINA_FALSE;
if (elm_widget_focus_get(obj) && (sd->selected) &&
@ -3571,7 +3571,7 @@ _elm_gengrid_elm_widget_interest_region_get(Eo *obj, Elm_Gengrid_Data *sd)
}
end:
return elm_obj_widget_interest_region_get(efl_super(obj, MY_CLASS));
return efl_ui_widget_interest_region_get(efl_super(obj, MY_CLASS));
}
static Eina_Bool _elm_gengrid_smart_focus_next_enable = EINA_FALSE;
@ -3602,7 +3602,7 @@ EOLIAN static Efl_Ui_Theme_Apply
_elm_gengrid_elm_widget_theme_apply(Eo *obj, Elm_Gengrid_Data *sd EINA_UNUSED)
{
Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
_mirrored_set(obj, efl_ui_mirrored_get(obj));
@ -5732,7 +5732,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)
{
return elm_obj_widget_focus_state_apply(efl_super(obj, MY_CLASS), current_state, configured_state, obj);
return efl_ui_widget_focus_state_apply(efl_super(obj, MY_CLASS), current_state, configured_state, obj);
}
EOLIAN static void

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

@ -2887,7 +2887,7 @@ _elm_genlist_item_content_focus_set(Elm_Gen_Item *it, Elm_Focus_Direction dir)
{
Evas_Object *nextfocus;
Elm_Object_Item *nextfocus_item;
if (elm_obj_widget_focus_next_get(focused_obj, dir, &nextfocus, &nextfocus_item))
if (efl_ui_widget_focus_next_get(focused_obj, dir, &nextfocus, &nextfocus_item))
{
if (nextfocus_item)
elm_object_item_focus_set(nextfocus_item, EINA_TRUE);
@ -3301,7 +3301,7 @@ _elm_genlist_elm_widget_on_focus_update(Eo *obj, Elm_Genlist_Data *sd, Elm_Objec
Elm_Object_Item *eo_it = NULL;
Eina_Bool is_sel = EINA_FALSE;
int_ret = elm_obj_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL);
int_ret = efl_ui_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) &&
@ -3375,7 +3375,7 @@ _elm_genlist_elm_widget_theme_apply(Eo *obj, Elm_Genlist_Data *sd)
Eina_List *l;
Elm_Gen_Item *it;
int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
evas_event_freeze(evas_object_evas_get(obj));

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

@ -32,7 +32,7 @@ _elm_glview_elm_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 = elm_obj_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL);
int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL);
if (!int_ret) return EINA_FALSE;
if (elm_widget_focus_get(obj))

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

@ -36,7 +36,7 @@ _elm_grid_elm_widget_theme_apply(Eo *obj, void *sd EINA_UNUSED)
{
Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
_mirrored_set(obj, efl_ui_mirrored_get(obj));
@ -60,7 +60,7 @@ _elm_grid_efl_canvas_group_group_add(Eo *obj, void *_pd EINA_UNUSED)
elm_widget_can_focus_set(obj, EINA_FALSE);
elm_obj_widget_theme_apply(obj);
efl_ui_widget_theme_apply(obj);
}
EOLIAN static void

8
src/lib/elementary/elm_hover.c
View File

@ -301,7 +301,7 @@ EOLIAN static Efl_Ui_Theme_Apply
_elm_hover_elm_widget_theme_apply(Eo *obj, Elm_Hover_Data *sd)
{
Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
if (sd->smt_sub) _elm_hover_smt_sub_re_eval(obj);
@ -706,7 +706,7 @@ _elm_hover_efl_object_constructor(Eo *obj, Elm_Hover_Data *pd)
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
efl_access_role_set(obj, EFL_ACCESS_ROLE_POPUP_MENU);
pd->manager = elm_obj_widget_focus_manager_create(obj, obj);
pd->manager = efl_ui_widget_focus_manager_create(obj, obj);
efl_composite_attach(obj, pd->manager);
@ -747,7 +747,7 @@ elm_hover_parent_set(Evas_Object *obj,
Evas_Object *parent)
{
ELM_HOVER_CHECK(obj);
elm_obj_widget_parent_set(obj, parent);
efl_ui_widget_parent_set(obj, parent);
}
EOLIAN static void
@ -783,7 +783,7 @@ EAPI Evas_Object *
elm_hover_parent_get(const Evas_Object *obj)
{
ELM_HOVER_CHECK(obj) NULL;
return elm_obj_widget_parent_get((Eo *) obj);
return efl_ui_widget_parent_get((Eo *) obj);
}
EOLIAN static Evas_Object*

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

@ -371,7 +371,7 @@ _elm_icon_elm_widget_theme_apply(Eo *obj, Elm_Icon_Data *sd)
if (sd->stdicon)
_elm_theme_object_icon_set(obj, sd->stdicon, elm_widget_style_get(obj));
int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
return int_ret;

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

@ -451,7 +451,7 @@ _elm_index_elm_widget_theme_apply(Eo *obj, Elm_Index_Data *sd)
else
eina_stringshare_replace(&ld->group, "base/vertical");
int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
elm_coords_finger_size_adjust(1, &minw, 1, &minh);
@ -1583,7 +1583,7 @@ _elm_index_efl_ui_direction_direction_set(Eo *obj, Elm_Index_Data *sd, Efl_Ui_Di
sd->dir = dir;
elm_obj_widget_theme_apply(obj);
efl_ui_widget_theme_apply(obj);
}
EOLIAN static Efl_Ui_Dir

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

@ -4672,7 +4672,7 @@ _elm_interface_scrollable_elm_widget_focus_manager_create(Eo *obj EINA_UNUSED, E
EOLIAN static Efl_Object*
_elm_interface_scrollable_efl_object_constructor(Eo *obj, Elm_Scrollable_Smart_Interface_Data *pd EINA_UNUSED)
{
pd->manager = elm_obj_widget_focus_manager_create(obj, obj);
pd->manager = efl_ui_widget_focus_manager_create(obj, obj);
efl_composite_attach(obj, pd->manager);

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

@ -190,7 +190,7 @@ _elm_label_elm_widget_theme_apply(Eo *obj, Elm_Label_Data *sd)
evas_event_freeze(evas_object_evas_get(obj));
int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
_elm_label_horizontal_size_policy_update(obj, sd);

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

@ -296,7 +296,7 @@ _elm_list_item_content_focus_set(Elm_List_Item_Data *it, Elm_Focus_Direction dir
{
Evas_Object *nextfocus;
Elm_Object_Item *nextfocus_item;
if (elm_obj_widget_focus_next_get(focused, dir, &nextfocus, &nextfocus_item))
if (efl_ui_widget_focus_next_get(focused, dir, &nextfocus, &nextfocus_item))
{
if (nextfocus_item)
elm_object_item_focus_set(nextfocus_item, EINA_TRUE);
@ -1035,7 +1035,7 @@ _show_region_hook(void *data EINA_UNUSED, Evas_Object *obj, Eina_Rect r)
EOLIAN static Eina_Bool
_elm_list_elm_widget_on_disabled_update(Eo *obj, Elm_List_Data *sd, Eina_Bool disabled)
{
if (!elm_obj_widget_on_disabled_update(efl_super(obj, MY_CLASS), disabled))
if (!efl_ui_widget_on_disabled_update(efl_super(obj, MY_CLASS), disabled))
return EINA_FALSE;
if (disabled)
@ -1080,7 +1080,7 @@ _elm_list_elm_widget_theme_apply(Eo *obj, Elm_List_Data *sd)
Eina_List *n;
Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
_mirrored_set(obj, efl_ui_mirrored_get(obj));
@ -1242,7 +1242,7 @@ _elm_list_elm_widget_on_focus_update(Eo *obj, Elm_List_Data *sd, Elm_Object_Item
Elm_Object_Item *eo_it = NULL;
Eina_Bool is_sel = EINA_FALSE;
int_ret = elm_obj_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL);
int_ret = efl_ui_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)

10
src/lib/elementary/elm_main.c
View File

@ -1880,28 +1880,28 @@ elm_object_focus_move_policy_set(Evas_Object *obj,
Elm_Focus_Move_Policy policy)
{
EINA_SAFETY_ON_NULL_RETURN(obj);
elm_obj_widget_focus_move_policy_set(obj, policy);
efl_ui_widget_focus_move_policy_set(obj, policy);
}
EAPI Elm_Focus_Move_Policy
elm_object_focus_move_policy_get(const Evas_Object *obj)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(obj, EINA_FALSE);
return elm_obj_widget_focus_move_policy_get(obj);
return efl_ui_widget_focus_move_policy_get(obj);
}
EAPI Eina_Bool
elm_object_focus_move_policy_automatic_get(const Evas_Object *obj)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(obj, EINA_FALSE);
return elm_obj_widget_focus_move_policy_automatic_get(obj);
return efl_ui_widget_focus_move_policy_automatic_get(obj);
}
EAPI void
elm_object_focus_move_policy_automatic_set(Evas_Object *obj, Eina_Bool automatic)
{
EINA_SAFETY_ON_NULL_RETURN(obj);
return elm_obj_widget_focus_move_policy_automatic_set(obj, automatic);
return efl_ui_widget_focus_move_policy_automatic_set(obj, automatic);
}
EAPI void
@ -2150,7 +2150,7 @@ EAPI Elm_Object_Item *
elm_object_focused_item_get(const Evas_Object *obj)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(obj, NULL);
return elm_obj_widget_focused_item_get(obj);
return efl_ui_widget_focused_item_get(obj);
}
EAPI void

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

@ -3948,7 +3948,7 @@ _elm_map_elm_widget_on_focus_update(Eo *obj, Elm_Map_Data *_pd EINA_UNUSED, Elm_
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
Eina_Bool int_ret = EINA_FALSE;
int_ret = elm_obj_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL);
int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL);
if (!int_ret) return EINA_FALSE;
if (elm_widget_focus_get(obj))
@ -3987,7 +3987,7 @@ _elm_map_elm_widget_theme_apply(Eo *obj, Elm_Map_Data *sd EINA_UNUSED)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED);
Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;

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

@ -39,7 +39,7 @@ EOLIAN static Efl_Ui_Theme_Apply
_elm_mapbuf_elm_widget_theme_apply(Eo *obj, Elm_Mapbuf_Data *sd EINA_UNUSED)
{
Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
_sizing_eval(obj);

10
src/lib/elementary/elm_menu.c
View File

@ -241,7 +241,7 @@ _elm_menu_elm_widget_theme_apply(Eo *obj, Elm_Menu_Data *sd)
const char *s;
char style[1024];
int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
if (sd->menu_bar)
@ -793,7 +793,7 @@ _elm_menu_menu_bar_set(Eo *obj, Eina_Bool menu_bar)
}
}
elm_obj_widget_theme_apply(obj);
efl_ui_widget_theme_apply(obj);
}
EAPI Evas_Object *
@ -821,7 +821,7 @@ _elm_menu_efl_object_constructor(Eo *obj, Elm_Menu_Data *sd)
Eo *parent = NULL;
Efl_Ui_Focus_Manager *manager;
manager = elm_obj_widget_focus_manager_create(obj, obj);
manager = efl_ui_widget_focus_manager_create(obj, obj);
efl_composite_attach(obj, manager);
_efl_ui_focus_manager_redirect_events_add(manager, obj);
@ -863,7 +863,7 @@ elm_menu_parent_set(Evas_Object *obj,
Evas_Object *parent)
{
ELM_MENU_CHECK(obj);
elm_obj_widget_parent_set(obj, parent);
efl_ui_widget_parent_set(obj, parent);
}
EOLIAN static void
@ -913,7 +913,7 @@ EAPI Evas_Object *
elm_menu_parent_get(const Evas_Object *obj)
{
ELM_MENU_CHECK(obj) NULL;
return elm_obj_widget_parent_get(obj);
return efl_ui_widget_parent_get(obj);
}
EAPI Elm_Widget_Item *

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

@ -144,7 +144,7 @@ EOLIAN static Efl_Ui_Theme_Apply
_elm_notify_elm_widget_theme_apply(Eo *obj, Elm_Notify_Data *sd)
{
Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
_mirrored_set(obj, efl_ui_mirrored_get(obj));
@ -489,7 +489,7 @@ elm_notify_parent_set(Evas_Object *obj,
Evas_Object *parent)
{
ELM_NOTIFY_CHECK(obj);
elm_obj_widget_parent_set(obj, parent);
efl_ui_widget_parent_set(obj, parent);
}
EOLIAN static void
@ -535,7 +535,7 @@ elm_notify_parent_get(const Evas_Object *obj)
{
ELM_NOTIFY_CHECK(obj) NULL;
Evas_Object *ret = NULL;
ret = elm_obj_widget_parent_get((Eo *) obj);
ret = efl_ui_widget_parent_get((Eo *) obj);
return ret;
}

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

@ -223,7 +223,7 @@ _elm_panel_elm_widget_theme_apply(Eo *obj, Elm_Panel_Data *sd)
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED);
int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
_mirrored_set(obj, efl_ui_mirrored_get(obj));
@ -811,7 +811,7 @@ _elm_panel_efl_canvas_group_group_add(Eo *obj, Elm_Panel_Data *priv)
priv->panel_edje = wd->resize_obj;
elm_obj_widget_theme_apply(obj);
efl_ui_widget_theme_apply(obj);
priv->bx = evas_object_box_add(evas_object_evas_get(obj));
evas_object_box_layout_set(priv->bx, _box_layout_cb, priv, NULL);
@ -1222,7 +1222,7 @@ _scroll_cb(Evas_Object *obj, void *data EINA_UNUSED)
EOLIAN static Eina_Bool
_elm_panel_elm_widget_on_disabled_update(Eo *obj, Elm_Panel_Data *sd, Eina_Bool disabled)
{
if (!elm_obj_widget_on_disabled_update(efl_super(obj, MY_CLASS), disabled))
if (!efl_ui_widget_on_disabled_update(efl_super(obj, MY_CLASS), disabled))
return EINA_FALSE;
if (sd->scrollable)

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

@ -55,7 +55,7 @@ _elm_photo_elm_widget_theme_apply(Eo *obj, Elm_Photo_Data *sd)
Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
edje_object_mirrored_set

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

@ -65,7 +65,7 @@ _elm_plug_elm_widget_on_focus_update(Eo *obj, void *sd EINA_UNUSED, Elm_Object_I
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
int_ret = elm_obj_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL);
int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL);
if (!int_ret) return EINA_FALSE;
if (elm_widget_focus_get(obj))
@ -84,7 +84,7 @@ EOLIAN static Efl_Ui_Theme_Apply
_elm_plug_elm_widget_theme_apply(Eo *obj, void *sd EINA_UNUSED)
{
Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
_sizing_eval(obj);

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

@ -90,7 +90,7 @@ EOLIAN static Efl_Ui_Theme_Apply
_elm_route_elm_widget_theme_apply(Eo *obj, Elm_Route_Data *sd EINA_UNUSED)
{
Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
//TODO

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

@ -390,7 +390,7 @@ EOLIAN static Efl_Ui_Theme_Apply
_elm_scroller_elm_widget_theme_apply(Eo *obj, Elm_Scroller_Data *sd EINA_UNUSED)
{
Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
_mirrored_set(obj, efl_ui_mirrored_get(obj));
@ -901,7 +901,7 @@ _elm_scroller_custom_widget_base_theme_set(Eo *obj, Elm_Scroller_Data *_pd EINA_
if (eina_stringshare_replace(&(ld->klass), klass) ||
eina_stringshare_replace(&(ld->group), group))
elm_obj_widget_theme_apply(obj);
efl_ui_widget_theme_apply(obj);
}
EAPI void
@ -1341,7 +1341,7 @@ _elm_scroller_elm_widget_focus_state_apply(Eo *obj, Elm_Scroller_Data *pd EINA_U
{
//undepended from logical or not we always reigster as full with ourself as redirect
configured_state->logical = EINA_TRUE;
return elm_obj_widget_focus_state_apply(efl_super(obj, MY_CLASS), current_state, configured_state, obj);
return efl_ui_widget_focus_state_apply(efl_super(obj, MY_CLASS), current_state, configured_state, obj);
}

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

@ -224,7 +224,7 @@ _elm_segment_control_elm_widget_theme_apply(Eo *obj, Elm_Segment_Control_Data *s
Elm_Object_Item *eo_item;
Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
rtl = efl_ui_mirrored_get(obj);
@ -248,7 +248,7 @@ _elm_segment_control_elm_widget_theme_apply(Eo *obj, Elm_Segment_Control_Data *s
EOLIAN static Eina_Bool
_elm_segment_control_elm_widget_on_disabled_update(Eo *obj, Elm_Segment_Control_Data *sd, Eina_Bool disabled)
{
if (!elm_obj_widget_on_disabled_update(efl_super(obj, MY_CLASS), disabled))
if (!efl_ui_widget_on_disabled_update(efl_super(obj, MY_CLASS), disabled))
return EINA_FALSE;
_update_list(sd);
@ -281,7 +281,7 @@ _elm_segment_control_elm_widget_focus_next(Eo *obj, Elm_Segment_Control_Data *sd
void *(*list_data_get)(const Eina_List *list);
/* Focus chain */
if ((items = elm_obj_widget_focus_custom_chain_get(obj)))
if ((items = efl_ui_widget_focus_custom_chain_get(obj)))
list_data_get = eina_list_data_get;
else
{

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

@ -27,7 +27,7 @@ _elm_separator_elm_widget_theme_apply(Eo *obj, Elm_Separator_Data *sd EINA_UNUSE
else
eina_stringshare_replace(&ld->group, "vertical");
int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
return int_ret;
@ -84,7 +84,7 @@ _elm_separator_horizontal_set(Eo *obj, Elm_Separator_Data *sd, Eina_Bool horizon
sd->horizontal = horizontal;
elm_obj_widget_theme_apply(obj);
efl_ui_widget_theme_apply(obj);
}
EOLIAN static Eina_Bool

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

@ -934,7 +934,7 @@ _elm_spinner_elm_widget_on_focus_update(Eo *obj, Elm_Spinner_Data *sd, Elm_Objec
{
Eina_Bool int_ret = EINA_FALSE;
int_ret = elm_obj_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL);
int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL);
if (!int_ret) return EINA_FALSE;
if (!elm_widget_focus_get(obj))

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

@ -36,7 +36,7 @@ EOLIAN static Efl_Ui_Theme_Apply
_elm_table_elm_widget_theme_apply(Eo *obj, void *sd EINA_UNUSED)
{
Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
_mirrored_set(obj, efl_ui_mirrored_get(obj));
@ -95,7 +95,7 @@ _elm_table_efl_canvas_group_group_add(Eo *obj, void *_pd EINA_UNUSED)
elm_widget_can_focus_set(obj, EINA_FALSE);
elm_widget_highlight_ignore_set(obj, EINA_FALSE);
elm_obj_widget_theme_apply(obj);
efl_ui_widget_theme_apply(obj);
}
EOLIAN static void

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

@ -751,7 +751,7 @@ _elm_toolbar_elm_widget_on_focus_update(Eo *obj, Elm_Toolbar_Data *sd, Elm_Objec
Eina_Bool int_ret = EINA_FALSE;
Elm_Object_Item *eo_it = NULL;
int_ret = elm_obj_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL);
int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL);
if (!int_ret) return EINA_FALSE;
if (!sd->items) return EINA_FALSE;
@ -1470,7 +1470,7 @@ _elm_toolbar_elm_widget_theme_apply(Eo *obj, Elm_Toolbar_Data *sd)
if (sd->delete_me) return EFL_UI_THEME_APPLY_SUCCESS;
Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
elm_widget_theme_object_set
@ -2309,7 +2309,7 @@ _elm_toolbar_item_efl_object_destructor(Eo *eo_item, Elm_Toolbar_Item_Data *item
_item_del(item);
if (item != sd->more_item)
elm_obj_widget_theme_apply(obj);
efl_ui_widget_theme_apply(obj);
efl_destructor(efl_super(eo_item, ELM_TOOLBAR_ITEM_CLASS));
}
@ -2955,7 +2955,7 @@ 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)
{
configured_state->logical = EINA_TRUE;
return elm_obj_widget_focus_state_apply(efl_super(obj, MY_CLASS), current_state, configured_state, obj);
return efl_ui_widget_focus_state_apply(efl_super(obj, MY_CLASS), current_state, configured_state, obj);
}
EOLIAN static Eo *
@ -2980,7 +2980,7 @@ _elm_toolbar_icon_size_set(Eo *obj, Elm_Toolbar_Data *sd, int icon_size)
if (sd->priv_icon_size) sd->icon_size = sd->priv_icon_size;
else sd->icon_size = sd->theme_icon_size;
elm_obj_widget_theme_apply(obj);
efl_ui_widget_theme_apply(obj);
}
EOLIAN static int

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

@ -239,7 +239,7 @@ _elm_widget_focus_highlight_style_set(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UN
Evas_Object *win = elm_widget_top_get(obj);
if (win && efl_isa(win, EFL_UI_WIN_CLASS))
return elm_obj_widget_focus_highlight_style_set(win, style);
return efl_ui_widget_focus_highlight_style_set(win, style);
return EINA_FALSE;
}
@ -454,7 +454,7 @@ _focus_state_eval(Eo *obj, Elm_Widget_Smart_Data *pd, Eina_Bool should, Eina_Boo
configuration.logical = EINA_FALSE;
}
if (!elm_obj_widget_focus_state_apply(obj, pd->focus, &configuration, NULL))
if (!efl_ui_widget_focus_state_apply(obj, pd->focus, &configuration, NULL))
{
//things went wrong or this thing is unregistered. Purge the current configuration.
pd->focus.manager = NULL;
@ -1173,7 +1173,7 @@ elm_widget_access(Evas_Object *obj,
ret &= elm_widget_access(child, is_access);
}
elm_obj_widget_on_access_update(obj, is_access);
efl_ui_widget_on_access_update(obj, is_access);
efl_event_callback_legacy_call(obj, ELM_WIDGET_EVENT_ACCESS_CHANGED, NULL);
return ret;
@ -1206,7 +1206,7 @@ elm_widget_theme(Evas_Object *obj)
EINA_LIST_FOREACH(sd->cursors, l, cur)
elm_cursor_theme(cur);
ret &= elm_obj_widget_theme_apply(obj);
ret &= efl_ui_widget_theme_apply(obj);
return ret;
}
@ -1253,7 +1253,7 @@ elm_widget_theme_specific(Evas_Object *obj,
elm_tooltip_theme(tt);
EINA_LIST_FOREACH(sd->cursors, l, cur)
elm_cursor_theme(cur);
elm_obj_widget_theme_apply(obj);
efl_ui_widget_theme_apply(obj);
}
EOLIAN static Efl_Ui_Theme_Apply
@ -1419,7 +1419,7 @@ _elm_widget_widget_sub_object_add(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Objec
_full_eval(sobj, sdc);
if (!sdc->on_create)
elm_obj_widget_on_orientation_update(sobj, sd->orient_mode);
efl_ui_widget_on_orientation_update(sobj, sd->orient_mode);
else
sdc->orient_mode = sd->orient_mode;
@ -1427,7 +1427,7 @@ _elm_widget_widget_sub_object_add(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Objec
{
if (!sdc->disabled && (elm_widget_disabled_get(obj)))
{
elm_obj_widget_on_disabled_update(sobj, EINA_TRUE);
efl_ui_widget_on_disabled_update(sobj, EINA_TRUE);
}
}
@ -1919,7 +1919,7 @@ _elm_widget_widget_top_get(Eo *obj, Elm_Widget_Smart_Data *sd)
if (sd->parent_obj)
{
if (!efl_isa(sd->parent_obj, ELM_WIDGET_CLASS)) return NULL;
return elm_obj_widget_top_get(sd->parent_obj);
return efl_ui_widget_top_get(sd->parent_obj);
}
return obj;
}
@ -2017,7 +2017,7 @@ _propagate_event(void *data EINA_UNUSED, const Efl_Event *eo_event)
continue;
}
if (elm_obj_widget_event(parent, eo_event, obj))
if (efl_ui_widget_event(parent, eo_event, obj))
return;
EINA_LIST_FOREACH_SAFE(sd->event_cb, l, l_prev, ecd)
@ -2373,7 +2373,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_update(obj, NULL);
efl_ui_widget_on_focus_update(obj, NULL);
}
if (focus)
@ -2448,7 +2448,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_update(obj, NULL);
efl_ui_widget_on_focus_update(obj, NULL);
}
Eina_Bool
@ -2469,7 +2469,7 @@ _elm_widget_disabled_eval(const Evas_Object *obj, Eina_Bool disabled)
{
if (elm_widget_is(child))
{
elm_obj_widget_on_disabled_update(child, disabled);
efl_ui_widget_on_disabled_update(child, disabled);
_elm_widget_disabled_eval(child, disabled);
}
}
@ -2481,7 +2481,7 @@ elm_widget_disabled_internal(Eo *obj, Eina_Bool disabled)
if (!disabled && elm_widget_disabled_get(elm_widget_parent_get(obj)))
return;
elm_obj_widget_on_disabled_update(obj, disabled);
efl_ui_widget_on_disabled_update(obj, disabled);
_elm_widget_disabled_eval(obj, disabled);
}
@ -2600,7 +2600,7 @@ _elm_widget_scroll_hold_push(Eo *obj, Elm_Widget_Smart_Data *sd)
}
}
}
if (sd->parent_obj) elm_obj_widget_scroll_hold_push(sd->parent_obj);
if (sd->parent_obj) efl_ui_widget_scroll_hold_push(sd->parent_obj);
// FIXME: on delete/reparent hold pop
}
@ -2624,7 +2624,7 @@ _elm_widget_scroll_hold_pop(Eo *obj, Elm_Widget_Smart_Data *sd)
}
}
}
if (sd->parent_obj) elm_obj_widget_scroll_hold_pop(sd->parent_obj);
if (sd->parent_obj) efl_ui_widget_scroll_hold_pop(sd->parent_obj);
if (sd->scroll_hold < 0) sd->scroll_hold = 0;
}
@ -2657,7 +2657,7 @@ _elm_widget_scroll_freeze_push(Eo *obj, Elm_Widget_Smart_Data *sd)
}
}
}
if (sd->parent_obj) elm_obj_widget_scroll_freeze_push(sd->parent_obj);
if (sd->parent_obj) efl_ui_widget_scroll_freeze_push(sd->parent_obj);
// FIXME: on delete/reparent freeze pop
}
@ -2681,7 +2681,7 @@ _elm_widget_scroll_freeze_pop(Eo *obj, Elm_Widget_Smart_Data *sd)
}
}
}
if (sd->parent_obj) elm_obj_widget_scroll_freeze_pop(sd->parent_obj);
if (sd->parent_obj) efl_ui_widget_scroll_freeze_pop(sd->parent_obj);
if (sd->scroll_freeze < 0) sd->scroll_freeze = 0;
}
@ -2741,7 +2741,7 @@ _elm_widget_theme_set(Eo *obj, Elm_Widget_Smart_Data *sd, Elm_Theme *th)
EAPI void
elm_widget_theme_set(Evas_Object *obj, Elm_Theme *th)
{
elm_obj_widget_theme_set(obj, th);
efl_ui_widget_theme_set(obj, th);
}
EAPI void
@ -2961,7 +2961,7 @@ _elm_widget_theme_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd)
EAPI Elm_Theme *
elm_widget_theme_get(const Evas_Object *obj)
{
return elm_obj_widget_theme_get(obj);
return efl_ui_widget_theme_get(obj);
}
EOLIAN static Efl_Ui_Theme_Apply
@ -3098,7 +3098,7 @@ _elm_widget_theme_object_set(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Object *ed
EAPI Efl_Ui_Theme_Apply
elm_widget_theme_object_set(Evas_Object *obj, Evas_Object *edj, const char *wname, const char *welement, const char *wstyle)
{
return elm_obj_widget_theme_object_set(obj, edj, wname, welement, wstyle);
return efl_ui_widget_theme_object_set(obj, edj, wname, welement, wstyle);
}
static void
@ -3512,7 +3512,7 @@ elm_widget_activate(Evas_Object *obj, Efl_Ui_Activate act)
ret = EINA_FALSE;
ret = elm_obj_widget_on_access_activate(obj, act);
ret = efl_ui_widget_on_access_activate(obj, act);
if (ret) return;
@ -3573,7 +3573,7 @@ _elm_widget_orientation_mode_disabled_set(Eo *obj, Elm_Widget_Smart_Data *sd, Ei
if (!sd_parent) orient_mode = 0;
else orient_mode = sd_parent->orient_mode;
}
elm_obj_widget_on_orientation_update(obj, orient_mode);
efl_ui_widget_on_orientation_update(obj, orient_mode);
}
EOLIAN static Eina_Bool
@ -3594,7 +3594,7 @@ _elm_widget_on_orientation_update(Eo *obj, Elm_Widget_Smart_Data *sd, int orient
EINA_LIST_FOREACH (sd->subobjs, l, child)
{
if (elm_widget_is(child))
elm_obj_widget_on_orientation_update(child, orient_mode);
efl_ui_widget_on_orientation_update(child, orient_mode);
}
if (orient_mode != -1)
@ -3667,7 +3667,7 @@ _elm_widget_focus_move_policy_automatic_set(Eo *obj, Elm_Widget_Smart_Data *sd,
if (automatic)
{
elm_obj_widget_focus_move_policy_set(obj, elm_config_focus_move_policy_get());
efl_ui_widget_focus_move_policy_set(obj, elm_config_focus_move_policy_get());
}
}
}
@ -5121,7 +5121,7 @@ _elm_widget_efl_object_constructor(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSE
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
parent = efl_parent_get(obj);
elm_obj_widget_parent_set(obj, parent);
efl_ui_widget_parent_set(obj, parent);
sd->on_create = EINA_FALSE;
efl_access_role_set(obj, EFL_ACCESS_ROLE_UNKNOWN);
@ -5176,7 +5176,7 @@ _elm_widget_efl_object_debug_name_override(Eo *obj, Elm_Widget_Smart_Data *sd EI
{
const char *focus = "";
if (elm_obj_widget_focus_get(obj)) focus = ":focused";
if (efl_ui_widget_focus_get(obj)) focus = ":focused";
efl_debug_name_override(efl_super(obj, MY_CLASS), sb);
eina_strbuf_append_printf(sb, "%s", focus);
}
@ -5437,7 +5437,7 @@ _elm_widget_efl_ui_focus_object_focus_set(Eo *obj, Elm_Widget_Smart_Data *pd, Ei
efl_ui_focus_object_focus_set(efl_super(obj, MY_CLASS), focus);
elm_obj_widget_on_focus_update(obj, NULL);
efl_ui_widget_on_focus_update(obj, NULL);
}
EOLIAN static Efl_Ui_Focus_Manager*

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

@ -24,7 +24,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Efl.Access,
{
[[Elementary widget abstract class]]
legacy_prefix: elm_widget;
eo_prefix: elm_obj_widget;
eo_prefix: efl_ui_widget;
event_prefix: elm_widget;
data: Elm_Widget_Smart_Data;
methods {