diff options
167 files changed, 659 insertions, 658 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in index 06b1e60a02..dfe0f71c17 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -174,7 +174,7 @@ src/lib/elementary/elm_transit.c src/lib/elementary/elm_util.c src/lib/elementary/efl_ui_video.c src/lib/elementary/elm_web2.c -src/lib/elementary/elm_widget.c +src/lib/elementary/efl_ui_widget.c src/lib/elementary/efl_ui_win.c src/lib/elementary/els_box.c src/lib/elementary/els_cursor.c diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am index 5b292a5445..dffd96f9a1 100644 --- a/src/Makefile_Elementary.am +++ b/src/Makefile_Elementary.am @@ -2,7 +2,7 @@ ### Library elm_public_eolian_files = \ - lib/elementary/elm_widget.eo \ + lib/elementary/efl_ui_widget.eo \ lib/elementary/efl_ui_bg.eo \ lib/elementary/efl_ui_bg_widget.eo \ lib/elementary/efl_ui_button.eo \ @@ -711,7 +711,7 @@ lib_elementary_libelementary_la_SOURCES = \ lib/elementary/elm_view_list.c \ lib/elementary/elm_view_form.c \ lib/elementary/elm_web2.c \ - lib/elementary/elm_widget.c \ + lib/elementary/efl_ui_widget.c \ lib/elementary/efl_ui_win.c \ lib/elementary/efl_ui_win_inlined.c \ lib/elementary/efl_ui_win_socket.c \ diff --git a/src/lib/elementary/Elementary.h b/src/lib/elementary/Elementary.h index 57192ae4b1..da2cc35440 100644 --- a/src/lib/elementary/Elementary.h +++ b/src/lib/elementary/Elementary.h @@ -277,7 +277,7 @@ EAPI extern Elm_Version *elm_version; #ifdef EFL_EO_API_SUPPORT # include <efl_ui_list_segarray.h> # include <efl_config_global.eo.h> -# include <elm_widget.eo.h> +# include <efl_ui_widget.eo.h> # include <efl_ui_widget_part.eo.h> # include <efl_ui_widget_part_bg.eo.h> # include <efl_ui_widget_part_shadow.eo.h> diff --git a/src/lib/elementary/efl_access_widget_action.c b/src/lib/elementary/efl_access_widget_action.c index 89836ede0b..a8bed05f60 100644 --- a/src/lib/elementary/efl_access_widget_action.c +++ b/src/lib/elementary/efl_access_widget_action.c @@ -49,7 +49,7 @@ _efl_access_widget_action_efl_access_action_action_keybinding_get(Eo *obj, void Elm_Config_Binding_Key *binding; int tmp = 0; - if (!efl_isa(obj, ELM_WIDGET_CLASS)) + if (!efl_isa(obj, EFL_UI_WIDGET_CLASS)) return NULL; actions = efl_access_widget_action_elm_actions_get(obj); diff --git a/src/lib/elementary/efl_ui_box.eo b/src/lib/elementary/efl_ui_box.eo index ac8834d51e..e0a028028e 100644 --- a/src/lib/elementary/efl_ui_box.eo +++ b/src/lib/elementary/efl_ui_box.eo @@ -1,4 +1,4 @@ -class Efl.Ui.Box (Elm.Widget, Efl.Pack.Linear, Efl.Pack.Layout, +class Efl.Ui.Box (Efl.Ui.Widget, Efl.Pack.Linear, Efl.Pack.Layout, Efl.Ui.Direction) { [[The box widget. diff --git a/src/lib/elementary/efl_ui_button.c b/src/lib/elementary/efl_ui_button.c index e2b4d09ecc..34dbd02ca7 100644 --- a/src/lib/elementary/efl_ui_button.c +++ b/src/lib/elementary/efl_ui_button.c @@ -88,7 +88,7 @@ _efl_ui_button_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Button_Data *_pd EINA_UNUS } EOLIAN static Eina_Bool -_efl_ui_button_elm_widget_on_access_activate(Eo *obj, Efl_Ui_Button_Data *_pd EINA_UNUSED, Efl_Ui_Activate act) +_efl_ui_button_efl_ui_widget_on_access_activate(Eo *obj, Efl_Ui_Button_Data *_pd EINA_UNUSED, Efl_Ui_Activate act) { if (elm_widget_disabled_get(obj)) return EINA_FALSE; if (act != EFL_UI_ACTIVATE_DEFAULT) return EINA_FALSE; @@ -121,7 +121,7 @@ _icon_signal_emit(Evas_Object *obj) * is elm.swallow.content, not elm.swallow.icon. Fix that whenever we * can changed the theme API */ EOLIAN static Efl_Ui_Theme_Apply -_efl_ui_button_elm_widget_theme_apply(Eo *obj, Efl_Ui_Button_Data *_pd EINA_UNUSED) +_efl_ui_button_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Button_Data *_pd EINA_UNUSED) { Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; @@ -136,7 +136,7 @@ _efl_ui_button_elm_widget_theme_apply(Eo *obj, Efl_Ui_Button_Data *_pd EINA_UNUS * is elm.swallow.content, not elm.swallow.icon. Fix that whenever we * can changed the theme API */ EOLIAN static Eina_Bool -_efl_ui_button_elm_widget_widget_sub_object_del(Eo *obj, Efl_Ui_Button_Data *_pd EINA_UNUSED, Evas_Object *sobj) +_efl_ui_button_efl_ui_widget_widget_sub_object_del(Eo *obj, Efl_Ui_Button_Data *_pd EINA_UNUSED, Evas_Object *sobj) { Eina_Bool int_ret = EINA_FALSE; diff --git a/src/lib/elementary/efl_ui_button.eo b/src/lib/elementary/efl_ui_button.eo index 12b118a782..cb165ed84a 100644 --- a/src/lib/elementary/efl_ui_button.eo +++ b/src/lib/elementary/efl_ui_button.eo @@ -15,10 +15,10 @@ class Efl.Ui.Button (Efl.Ui.Layout, Efl.Ui.Clickable, Efl.Ui.Autorepeat, Efl.Ui.Autorepeat.autorepeat_gap_timeout { set; get; } Efl.Ui.Autorepeat.autorepeat_enabled { set; get; } Efl.Ui.Autorepeat.autorepeat_supported { get;} - Elm.Widget.on_access_activate; - Elm.Widget.theme_apply; - Elm.Widget.widget_sub_object_del; - Elm.Widget.widget_event; + Efl.Ui.Widget.on_access_activate; + Efl.Ui.Widget.theme_apply; + Efl.Ui.Widget.widget_sub_object_del; + Efl.Ui.Widget.widget_event; Efl.Access.Widget.Action.elm_actions { get; } Efl.Part.part; Efl.Content.content { get; set; } diff --git a/src/lib/elementary/efl_ui_calendar.c b/src/lib/elementary/efl_ui_calendar.c index 492b588614..2810eeb837 100644 --- a/src/lib/elementary/efl_ui_calendar.c +++ b/src/lib/elementary/efl_ui_calendar.c @@ -528,7 +528,7 @@ _spinner_buttons_add(Evas_Object *obj, Efl_Ui_Calendar_Data *sd) } EOLIAN static Efl_Ui_Theme_Apply -_efl_ui_calendar_elm_widget_theme_apply(Eo *obj, Efl_Ui_Calendar_Data *sd) +_efl_ui_calendar_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Calendar_Data *sd) { Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; @@ -863,7 +863,7 @@ _key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED) } EOLIAN static Eina_Bool -_efl_ui_calendar_elm_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, Elm_Object_Item *item EINA_UNUSED) { Eina_Bool int_ret = EINA_FALSE; @@ -957,7 +957,7 @@ _access_obj_process(Evas_Object *obj, Eina_Bool is_access) } EOLIAN static void -_efl_ui_calendar_elm_widget_on_access_update(Eo *obj EINA_UNUSED, Efl_Ui_Calendar_Data *_pd EINA_UNUSED, Eina_Bool acs) +_efl_ui_calendar_efl_ui_widget_on_access_update(Eo *obj EINA_UNUSED, Efl_Ui_Calendar_Data *_pd EINA_UNUSED, Eina_Bool acs) { _efl_ui_calendar_smart_focus_next_enable = acs; _access_obj_process(obj, _efl_ui_calendar_smart_focus_next_enable); diff --git a/src/lib/elementary/efl_ui_calendar.eo b/src/lib/elementary/efl_ui_calendar.eo index 35ac4d9069..088d2e153e 100644 --- a/src/lib/elementary/efl_ui_calendar.eo +++ b/src/lib/elementary/efl_ui_calendar.eo @@ -106,10 +106,10 @@ class Efl.Ui.Calendar (Efl.Ui.Layout, Efl.Ui.Focus.Composition, Efl.Access.Widge Efl.Object.constructor; Efl.Object.destructor; Efl.Canvas.Group.group_calculate; - Elm.Widget.theme_apply; - Elm.Widget.on_access_update; - Elm.Widget.on_focus_update; - Elm.Widget.widget_event; + Efl.Ui.Widget.theme_apply; + Efl.Ui.Widget.on_access_update; + Efl.Ui.Widget.on_focus_update; + Efl.Ui.Widget.widget_event; Efl.Access.Widget.Action.elm_actions { get; } Efl.Ui.Format.format_cb { set; } } diff --git a/src/lib/elementary/efl_ui_check.c b/src/lib/elementary/efl_ui_check.c index fc4ff5c7e4..f4917b32e4 100644 --- a/src/lib/elementary/efl_ui_check.c +++ b/src/lib/elementary/efl_ui_check.c @@ -117,7 +117,7 @@ _efl_ui_check_efl_access_state_set_get(Eo *obj, Efl_Ui_Check_Data *_pd EINA_UNUS * is elm.swallow.content, not elm.swallow.icon. Fix that whenever we * can changed the theme API */ EOLIAN static Eina_Bool -_efl_ui_check_elm_widget_widget_sub_object_del(Eo *obj, Efl_Ui_Check_Data *_pd EINA_UNUSED, Evas_Object *sobj) +_efl_ui_check_efl_ui_widget_widget_sub_object_del(Eo *obj, Efl_Ui_Check_Data *_pd EINA_UNUSED, Evas_Object *sobj) { Eina_Bool int_ret = EINA_FALSE; @@ -132,7 +132,7 @@ _efl_ui_check_elm_widget_widget_sub_object_del(Eo *obj, Efl_Ui_Check_Data *_pd E } EOLIAN static Eina_Bool -_efl_ui_check_elm_widget_on_access_activate(Eo *obj EINA_UNUSED, Efl_Ui_Check_Data *_pd EINA_UNUSED, Efl_Ui_Activate act) +_efl_ui_check_efl_ui_widget_on_access_activate(Eo *obj EINA_UNUSED, Efl_Ui_Check_Data *_pd EINA_UNUSED, Efl_Ui_Activate act) { if (elm_widget_disabled_get(obj)) return EINA_FALSE; if (act != EFL_UI_ACTIVATE_DEFAULT) return EINA_FALSE; @@ -150,7 +150,7 @@ _key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED) } EOLIAN static Efl_Ui_Theme_Apply -_efl_ui_check_elm_widget_theme_apply(Eo *obj, Efl_Ui_Check_Data *sd EINA_UNUSED) +_efl_ui_check_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Check_Data *sd EINA_UNUSED) { Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; diff --git a/src/lib/elementary/efl_ui_check.eo b/src/lib/elementary/efl_ui_check.eo index 44d79d9272..6544f39d8b 100644 --- a/src/lib/elementary/efl_ui_check.eo +++ b/src/lib/elementary/efl_ui_check.eo @@ -23,10 +23,10 @@ class Efl.Ui.Check (Efl.Ui.Nstate, Efl.Access.Widget.Action) implements { class.constructor; Efl.Object.constructor; - Elm.Widget.on_access_activate; - Elm.Widget.theme_apply; - Elm.Widget.widget_sub_object_del; - Elm.Widget.widget_event; + Efl.Ui.Widget.on_access_activate; + Efl.Ui.Widget.theme_apply; + Efl.Ui.Widget.widget_sub_object_del; + Efl.Ui.Widget.widget_event; Efl.Ui.Nstate.count { set; } Efl.Ui.Nstate.value { set; } Efl.Access.state_set { get; } diff --git a/src/lib/elementary/efl_ui_clock.c b/src/lib/elementary/efl_ui_clock.c index ac10a6155d..3fb6f773e8 100644 --- a/src/lib/elementary/efl_ui_clock.c +++ b/src/lib/elementary/efl_ui_clock.c @@ -449,7 +449,7 @@ _efl_ui_clock_edit_mode_get(Eo *obj EINA_UNUSED, Efl_Ui_Clock_Data *sd) } EOLIAN static Eina_Bool -_efl_ui_clock_elm_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, Elm_Object_Item *item EINA_UNUSED) { Eina_Bool int_ret = EINA_FALSE; @@ -466,7 +466,7 @@ _efl_ui_clock_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Clock_Data *sd, Elm_Obj } EOLIAN static Eina_Bool -_efl_ui_clock_elm_widget_on_disabled_update(Eo *obj, Efl_Ui_Clock_Data *sd, Eina_Bool disabled) +_efl_ui_clock_efl_ui_widget_on_disabled_update(Eo *obj, Efl_Ui_Clock_Data *sd, Eina_Bool disabled) { Clock_Field *field; unsigned int idx = 0; @@ -501,7 +501,7 @@ _efl_ui_clock_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Clock_Data *sd) } EOLIAN static Efl_Ui_Theme_Apply -_efl_ui_clock_elm_widget_theme_apply(Eo *obj, Efl_Ui_Clock_Data *sd) +_efl_ui_clock_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Clock_Data *sd) { Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; diff --git a/src/lib/elementary/efl_ui_clock.eo b/src/lib/elementary/efl_ui_clock.eo index a18a0af599..3211962e84 100644 --- a/src/lib/elementary/efl_ui_clock.eo +++ b/src/lib/elementary/efl_ui_clock.eo @@ -224,9 +224,9 @@ class Efl.Ui.Clock (Efl.Ui.Layout) implements { class.constructor; Efl.Object.constructor; - Elm.Widget.theme_apply; - Elm.Widget.on_disabled_update; - Elm.Widget.on_focus_update; + Efl.Ui.Widget.theme_apply; + Efl.Ui.Widget.on_disabled_update; + Efl.Ui.Widget.on_focus_update; Efl.Ui.Translatable.translation_update; } events { diff --git a/src/lib/elementary/efl_ui_flip.c b/src/lib/elementary/efl_ui_flip.c index 4fe972506d..3967a3a382 100644 --- a/src/lib/elementary/efl_ui_flip.c +++ b/src/lib/elementary/efl_ui_flip.c @@ -98,7 +98,7 @@ _sizing_eval(Evas_Object *obj) } EOLIAN static Efl_Ui_Theme_Apply -_efl_ui_flip_elm_widget_theme_apply(Eo *obj, Efl_Ui_Flip_Data *sd EINA_UNUSED) +_efl_ui_flip_efl_ui_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 = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); @@ -119,7 +119,7 @@ _changed_size_hints_cb(void *data, } EOLIAN static Eina_Bool -_efl_ui_flip_elm_widget_widget_sub_object_add(Eo *obj, Efl_Ui_Flip_Data *_pd EINA_UNUSED, Evas_Object *sobj) +_efl_ui_flip_efl_ui_widget_widget_sub_object_add(Eo *obj, Efl_Ui_Flip_Data *_pd EINA_UNUSED, Evas_Object *sobj) { Eina_Bool int_ret = EINA_FALSE; @@ -139,7 +139,7 @@ _efl_ui_flip_elm_widget_widget_sub_object_add(Eo *obj, Efl_Ui_Flip_Data *_pd EIN } EOLIAN static Eina_Bool -_efl_ui_flip_elm_widget_widget_sub_object_del(Eo *obj, Efl_Ui_Flip_Data *sd, Evas_Object *sobj) +_efl_ui_flip_efl_ui_widget_widget_sub_object_del(Eo *obj, Efl_Ui_Flip_Data *sd, Evas_Object *sobj) { Eina_Bool int_ret = EINA_FALSE; @@ -1743,7 +1743,7 @@ _flip_content_set(Evas_Object *obj, //evas_object_smart_member_add(content, obj); evas_object_clip_set (content, front ? sd->front.clip : sd->back.clip); - if (efl_isa(content, ELM_WIDGET_CLASS) && sd->state != front) + if (efl_isa(content, EFL_UI_WIDGET_CLASS) && sd->state != front) elm_widget_tree_unfocusable_set(content, EINA_TRUE); } @@ -1965,9 +1965,9 @@ _internal_elm_flip_go_to(Evas_Object *obj, else elm_object_focus_set(sd->back.content, EINA_TRUE); } - if (sd->front.content && efl_isa(sd->front.content, ELM_WIDGET_CLASS)) + if (sd->front.content && efl_isa(sd->front.content, EFL_UI_WIDGET_CLASS)) elm_widget_tree_unfocusable_set(sd->front.content, !front); - if (sd->back.content && efl_isa(sd->back.content, ELM_WIDGET_CLASS)) + if (sd->back.content && efl_isa(sd->back.content, EFL_UI_WIDGET_CLASS)) elm_widget_tree_unfocusable_set(sd->back.content, front); diff --git a/src/lib/elementary/efl_ui_flip.eo b/src/lib/elementary/efl_ui_flip.eo index 7bfd1cfa7d..892ebf9246 100644 --- a/src/lib/elementary/efl_ui_flip.eo +++ b/src/lib/elementary/efl_ui_flip.eo @@ -26,7 +26,7 @@ enum Efl.Ui.Flip.Interaction page [[Page interaction]] } -class Efl.Ui.Flip (Elm.Widget, Efl.Pack.Linear, Efl.Part) +class Efl.Ui.Flip (Efl.Ui.Widget, Efl.Pack.Linear, Efl.Part) { [[Efl UI flip class]] legacy_prefix: elm_flip; @@ -229,9 +229,9 @@ class Efl.Ui.Flip (Elm.Widget, Efl.Pack.Linear, Efl.Part) implements { class.constructor; Efl.Object.constructor; - Elm.Widget.widget_sub_object_add; - Elm.Widget.theme_apply; - Elm.Widget.widget_sub_object_del; + Efl.Ui.Widget.widget_sub_object_add; + Efl.Ui.Widget.theme_apply; + Efl.Ui.Widget.widget_sub_object_del; Efl.Container.content_iterate; Efl.Container.content_count; Efl.Container.content_remove; diff --git a/src/lib/elementary/efl_ui_focus_composition.c b/src/lib/elementary/efl_ui_focus_composition.c index 2b2b381fd7..35f739906c 100644 --- a/src/lib/elementary/efl_ui_focus_composition.c +++ b/src/lib/elementary/efl_ui_focus_composition.c @@ -96,7 +96,7 @@ _efl_ui_focus_composition_composition_elements_set(Eo *obj, Efl_Ui_Focus_Composi EINA_SAFETY_ON_NULL_GOTO(elem, cont); - if (!efl_isa(elem, ELM_WIDGET_CLASS)) + if (!efl_isa(elem, EFL_UI_WIDGET_CLASS)) { if (efl_isa(elem, EFL_UI_FOCUS_OBJECT_MIXIN)) { @@ -111,7 +111,7 @@ _efl_ui_focus_composition_composition_elements_set(Eo *obj, Efl_Ui_Focus_Composi } else { - EINA_SAFETY_ERROR("List contains element that is not EFL_UI_FOCUS_OBJECT_MIXIN or EFL_GFX_INTERFACE or ELM_WIDGET_CLASS"); + EINA_SAFETY_ERROR("List contains element that is not EFL_UI_FOCUS_OBJECT_MIXIN or EFL_GFX_INTERFACE or EFL_UI_WIDGET_CLASS"); continue; } } @@ -130,7 +130,7 @@ _efl_ui_focus_composition_composition_elements_get(Eo *obj EINA_UNUSED, Efl_Ui_F } EOLIAN static Eina_Bool -_efl_ui_focus_composition_elm_widget_focus_state_apply(Eo *obj, Efl_Ui_Focus_Composition_Data *pd, Efl_Ui_Widget_Focus_State current_state, Efl_Ui_Widget_Focus_State *configured_state, Elm_Widget *redirect) +_efl_ui_focus_composition_efl_ui_widget_focus_state_apply(Eo *obj, Efl_Ui_Focus_Composition_Data *pd, Efl_Ui_Widget_Focus_State current_state, Efl_Ui_Widget_Focus_State *configured_state, Efl_Ui_Widget *redirect) { Eina_Bool registered; diff --git a/src/lib/elementary/efl_ui_focus_composition.eo b/src/lib/elementary/efl_ui_focus_composition.eo index cdf295231d..028b1db1ff 100644 --- a/src/lib/elementary/efl_ui_focus_composition.eo +++ b/src/lib/elementary/efl_ui_focus_composition.eo @@ -1,4 +1,4 @@ -mixin Efl.Ui.Focus.Composition (Efl.Interface, Elm.Widget ) { +mixin Efl.Ui.Focus.Composition (Efl.Interface, Efl.Ui.Widget) { [[This defines the inheriting widget as Composition widget. A composition widget is a widget that's the logical parent of another set of widgets which can be used for interaction. @@ -7,13 +7,13 @@ mixin Efl.Ui.Focus.Composition (Efl.Interface, Elm.Widget ) { @property composition_elements @protected { [[Set the order of elements that will be used for composition - Elements of the list can be either an Elm.Widget, an Efl.Ui.Focus.Object or an Efl.Gfx. + Elements of the list can be either an Efl.Ui.Widget, an Efl.Ui.Focus.Object or an Efl.Gfx. If the element is an Efl.Gfx, then the geometry is used as focus geometry, the focus property is redirected to the evas focus property. The mixin will take care of registration. If the element is an Efl.Ui.Focus.Object, then the mixin will take care of registering the element. - If the element is a Elm.Widget nothing is done and the widget is simply part of the order. + If the element is a Efl.Ui.Widget nothing is done and the widget is simply part of the order. ]] values { logical_order : list<Efl.Gfx> @owned; [[The order to use]] @@ -50,7 +50,7 @@ mixin Efl.Ui.Focus.Composition (Efl.Interface, Elm.Widget ) { } } implements { - Elm.Widget.focus_state_apply; + Efl.Ui.Widget.focus_state_apply; Efl.Ui.Focus.Object.prepare_logical; @empty .prepare; } diff --git a/src/lib/elementary/efl_ui_focus_layer.c b/src/lib/elementary/efl_ui_focus_layer.c index 456c6e9ece..e19b0f802e 100644 --- a/src/lib/elementary/efl_ui_focus_layer.c +++ b/src/lib/elementary/efl_ui_focus_layer.c @@ -17,7 +17,7 @@ typedef struct { } Efl_Ui_Focus_Layer_Data; EOLIAN static Efl_Ui_Focus_Manager* -_efl_ui_focus_layer_elm_widget_focus_manager_create(Eo *obj, Efl_Ui_Focus_Layer_Data *pd EINA_UNUSED, Efl_Ui_Focus_Object *root) +_efl_ui_focus_layer_efl_ui_widget_focus_manager_create(Eo *obj, Efl_Ui_Focus_Layer_Data *pd EINA_UNUSED, Efl_Ui_Focus_Object *root) { return efl_add(EFL_UI_FOCUS_MANAGER_ROOT_FOCUS_CLASS, obj, efl_ui_focus_manager_root_set(efl_added, root)); } @@ -65,7 +65,7 @@ _efl_ui_focus_layer_efl_ui_focus_user_focus_manager_get(Eo *obj, Efl_Ui_Focus_La } EOLIAN static Eina_Bool -_efl_ui_focus_layer_elm_widget_focus_state_apply(Eo *obj EINA_UNUSED, Efl_Ui_Focus_Layer_Data *pd EINA_UNUSED, Efl_Ui_Widget_Focus_State current_state EINA_UNUSED, Efl_Ui_Widget_Focus_State *configured_state EINA_UNUSED, Elm_Widget *redirect EINA_UNUSED) +_efl_ui_focus_layer_efl_ui_widget_focus_state_apply(Eo *obj EINA_UNUSED, Efl_Ui_Focus_Layer_Data *pd EINA_UNUSED, Efl_Ui_Widget_Focus_State current_state EINA_UNUSED, Efl_Ui_Widget_Focus_State *configured_state EINA_UNUSED, Efl_Ui_Widget *redirect EINA_UNUSED) { return EINA_FALSE; } diff --git a/src/lib/elementary/efl_ui_focus_layer.eo b/src/lib/elementary/efl_ui_focus_layer.eo index 426ca89ee8..5d4b2d8c35 100644 --- a/src/lib/elementary/efl_ui_focus_layer.eo +++ b/src/lib/elementary/efl_ui_focus_layer.eo @@ -1,4 +1,4 @@ -mixin Efl.Ui.Focus.Layer (Efl.Interface, Elm.Widget, Efl.Gfx, Efl.Ui.Focus.Manager) { +mixin Efl.Ui.Focus.Layer (Efl.Interface, Efl.Ui.Widget, Efl.Gfx, Efl.Ui.Focus.Manager) { [[This defines the inheriting widget as focus layer A focus layer is the uppermost one which received input and handles all focus related events for as long as it exists and is visible. It's NOT possible to escape this layer with focus movement. @@ -21,8 +21,8 @@ mixin Efl.Ui.Focus.Layer (Efl.Interface, Elm.Widget, Efl.Gfx, Efl.Ui.Focus.Manag } } implements { - Elm.Widget.focus_manager_create; - Elm.Widget.focus_state_apply; + Efl.Ui.Widget.focus_manager_create; + Efl.Ui.Widget.focus_state_apply; Efl.Gfx.visible {set;} Efl.Ui.Focus.Manager.move; Efl.Ui.Focus.User.focus_manager { get; } diff --git a/src/lib/elementary/efl_ui_focus_parent_provider_gen.c b/src/lib/elementary/efl_ui_focus_parent_provider_gen.c index ad1ed62837..ca2598c049 100644 --- a/src/lib/elementary/efl_ui_focus_parent_provider_gen.c +++ b/src/lib/elementary/efl_ui_focus_parent_provider_gen.c @@ -8,7 +8,7 @@ typedef struct { Eina_Hash *map; - Elm_Widget *container; + Efl_Ui_Widget *container; Efl_Ui_Focus_Parent_Provider *provider; } Efl_Ui_Focus_Parent_Provider_Gen_Data; @@ -27,7 +27,7 @@ _efl_ui_focus_parent_provider_gen_content_item_map_get(Eo *obj EINA_UNUSED, Efl_ } EOLIAN static void -_efl_ui_focus_parent_provider_gen_container_set(Eo *obj, Efl_Ui_Focus_Parent_Provider_Gen_Data *pd, Elm_Widget *container) +_efl_ui_focus_parent_provider_gen_container_set(Eo *obj, Efl_Ui_Focus_Parent_Provider_Gen_Data *pd, Efl_Ui_Widget *container) { EINA_SAFETY_ON_TRUE_RETURN(efl_finalized_get(obj)); @@ -38,7 +38,7 @@ _efl_ui_focus_parent_provider_gen_container_set(Eo *obj, Efl_Ui_Focus_Parent_Pro pd->provider = efl_provider_find(efl_parent_get(pd->container), EFL_UI_FOCUS_PARENT_PROVIDER_INTERFACE); } -EOLIAN static Elm_Widget* +EOLIAN static Efl_Ui_Widget* _efl_ui_focus_parent_provider_gen_container_get(Eo *obj EINA_UNUSED, Efl_Ui_Focus_Parent_Provider_Gen_Data *pd) { return pd->container; @@ -53,7 +53,7 @@ _efl_ui_focus_parent_provider_gen_efl_ui_focus_parent_provider_find_logical_pare if (elm_widget_parent_widget_get(widget) != pd->container) { - Elm_Widget *parent = elm_widget_parent_widget_get(widget); + Efl_Ui_Widget *parent = elm_widget_parent_widget_get(widget); //move forward so we get the last widget above the gengrid level, this may be the widget out of the map do { above_gengrid = parent; diff --git a/src/lib/elementary/efl_ui_focus_parent_provider_gen.eo b/src/lib/elementary/efl_ui_focus_parent_provider_gen.eo index fbdf7d2bba..3579544b27 100644 --- a/src/lib/elementary/efl_ui_focus_parent_provider_gen.eo +++ b/src/lib/elementary/efl_ui_focus_parent_provider_gen.eo @@ -4,13 +4,13 @@ class Efl.Ui.Focus.Parent_Provider.Gen(Efl.Object, Efl.Ui.Focus.Parent_Provider) @property content_item_map { [[Content item map property]] values { - map : hash<Elm.Widget, Elm.Widget.Item>; [[Item map]] + map : hash<Efl.Ui.Widget, Elm.Widget.Item>; [[Item map]] } } @property container { [[Container property]] values { - container : Elm.Widget; [[Container widget]] + container : Efl.Ui.Widget; [[Container widget]] } } } diff --git a/src/lib/elementary/efl_ui_focus_util.c b/src/lib/elementary/efl_ui_focus_util.c index efb3219fd1..76ec9280e5 100644 --- a/src/lib/elementary/efl_ui_focus_util.c +++ b/src/lib/elementary/efl_ui_focus_util.c @@ -18,7 +18,7 @@ _manager_changed(void *data, const Efl_Event *event EINA_UNUSED) EOLIAN static void _efl_ui_focus_util_focus(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, Efl_Ui_Focus_User *user) { - Elm_Widget *top, *o; + Efl_Ui_Widget *top, *o; Efl_Ui_Focus_Manager *m; m = efl_ui_focus_user_focus_manager_get(user); diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c index a807fa536b..4240d16e34 100644 --- a/src/lib/elementary/efl_ui_image.c +++ b/src/lib/elementary/efl_ui_image.c @@ -721,7 +721,7 @@ _efl_ui_image_efl_canvas_object_clip_set(Eo *obj, Efl_Ui_Image_Data *sd, Evas_Ob } EOLIAN static Efl_Ui_Theme_Apply -_efl_ui_image_elm_widget_theme_apply(Eo *obj, Efl_Ui_Image_Data *sd EINA_UNUSED) +_efl_ui_image_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Image_Data *sd EINA_UNUSED) { Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; diff --git a/src/lib/elementary/efl_ui_image.eo b/src/lib/elementary/efl_ui_image.eo index c7e5815204..254077df9e 100644 --- a/src/lib/elementary/efl_ui_image.eo +++ b/src/lib/elementary/efl_ui_image.eo @@ -18,7 +18,7 @@ struct Efl.Ui.Image.Error open_error: bool; [[$true if the error happened when opening the file, $false otherwise]] } -class Efl.Ui.Image (Elm.Widget, Efl.Ui.Clickable, Efl.Ui.Draggable, +class Efl.Ui.Image (Efl.Ui.Widget, Efl.Ui.Clickable, Efl.Ui.Draggable, Efl.File, Efl.Image, Efl.Image.Load, Efl.Player, Efl.Gfx.View, Efl.Access.Image, Efl.Access.Widget.Action, Efl.Gfx.Color, Efl.Orientation, Efl.Flipable, @@ -116,8 +116,8 @@ class Efl.Ui.Image (Elm.Widget, Efl.Ui.Clickable, Efl.Ui.Draggable, Efl.Ui.Draggable.drag_target { get; set; } Efl.Ui.Model.Connect.connect; Efl.Ui.View.model { get; set; } - Elm.Widget.theme_apply; - Elm.Widget.widget_event; + Efl.Ui.Widget.theme_apply; + Efl.Ui.Widget.widget_event; Efl.Access.Image.extents { get; } Efl.Access.Widget.Action.elm_actions { get; } } diff --git a/src/lib/elementary/efl_ui_image_zoomable.c b/src/lib/elementary/efl_ui_image_zoomable.c index 5592fcfa6b..89eb7c8b70 100644 --- a/src/lib/elementary/efl_ui_image_zoomable.c +++ b/src/lib/elementary/efl_ui_image_zoomable.c @@ -863,7 +863,7 @@ _mouse_up_cb(void *data, } EOLIAN static Eina_Bool -_efl_ui_image_zoomable_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Image_Zoomable_Data *_pd EINA_UNUSED, Elm_Object_Item *item EINA_UNUSED) +_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) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); Eina_Bool int_ret = EINA_FALSE; @@ -888,7 +888,7 @@ _efl_ui_image_zoomable_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Image_Zoomable } EOLIAN static Efl_Ui_Theme_Apply -_efl_ui_image_zoomable_elm_widget_theme_apply(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd) +_efl_ui_image_zoomable_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd) { Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; Eina_Bool fdo = EINA_FALSE; diff --git a/src/lib/elementary/efl_ui_image_zoomable.eo b/src/lib/elementary/efl_ui_image_zoomable.eo index 6aa65eaf64..264f6bbf5c 100644 --- a/src/lib/elementary/efl_ui_image_zoomable.eo +++ b/src/lib/elementary/efl_ui_image_zoomable.eo @@ -1,4 +1,4 @@ -class Efl.Ui.Image_Zoomable (Elm.Widget, Efl.Ui.Image, Efl.Ui.Zoom, +class Efl.Ui.Image_Zoomable (Efl.Ui.Widget, Efl.Ui.Image, Efl.Ui.Zoom, Efl.Ui.Scrollable.Interactive, Efl.Ui.Scrollbar) { @@ -58,9 +58,9 @@ class Efl.Ui.Image_Zoomable (Elm.Widget, Efl.Ui.Image, Efl.Ui.Zoom, Efl.Ui.Zoom.zoom { set; get; } Efl.Ui.Zoom.zoom_mode { set; get; } Efl.Canvas.Group.group_member_add; - Elm.Widget.theme_apply; - Elm.Widget.on_focus_update; - Elm.Widget.widget_event; + Efl.Ui.Widget.theme_apply; + Efl.Ui.Widget.on_focus_update; + Efl.Ui.Widget.widget_event; Efl.Ui.Scrollable.Interactive.scroll; Efl.Access.Widget.Action.elm_actions { get; } Efl.File.file { get; set; } diff --git a/src/lib/elementary/efl_ui_layout.c b/src/lib/elementary/efl_ui_layout.c index 4c7d86e9cd..aac070e063 100644 --- a/src/lib/elementary/efl_ui_layout.c +++ b/src/lib/elementary/efl_ui_layout.c @@ -335,7 +335,7 @@ _visuals_refresh(Evas_Object *obj, } EOLIAN static Eina_Bool -_efl_ui_layout_elm_widget_on_disabled_update(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED, Eina_Bool disabled) +_efl_ui_layout_efl_ui_widget_on_disabled_update(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED, Eina_Bool disabled) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); @@ -378,7 +378,7 @@ _efl_ui_layout_theme_internal(Eo *obj, Efl_Ui_Layout_Data *sd) } EOLIAN static Efl_Ui_Theme_Apply -_efl_ui_layout_elm_widget_theme_apply(Eo *obj, Efl_Ui_Layout_Data *sd) +_efl_ui_layout_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Layout_Data *sd) { Efl_Ui_Theme_Apply theme_apply = EFL_UI_THEME_APPLY_FAILED; @@ -390,7 +390,7 @@ _efl_ui_layout_elm_widget_theme_apply(Eo *obj, Efl_Ui_Layout_Data *sd) } EOLIAN static Eina_Bool -_efl_ui_layout_elm_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_Object_Item *item EINA_UNUSED) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); @@ -416,7 +416,7 @@ _efl_ui_layout_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_ } EOLIAN static Eina_Bool -_efl_ui_layout_elm_widget_widget_sub_object_add(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED, Evas_Object *sobj) +_efl_ui_layout_efl_ui_widget_widget_sub_object_add(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED, Evas_Object *sobj) { Eina_Bool int_ret = EINA_FALSE; @@ -433,7 +433,7 @@ _efl_ui_layout_elm_widget_widget_sub_object_add(Eo *obj, Efl_Ui_Layout_Data *_pd } EOLIAN static Eina_Bool -_efl_ui_layout_elm_widget_widget_sub_object_del(Eo *obj, Efl_Ui_Layout_Data *sd, Evas_Object *sobj) +_efl_ui_layout_efl_ui_widget_widget_sub_object_del(Eo *obj, Efl_Ui_Layout_Data *sd, Evas_Object *sobj) { Eina_List *l; Efl_Ui_Layout_Sub_Object_Data *sub_d; @@ -853,7 +853,7 @@ elm_layout_content_set(Evas_Object *obj, const char *swallow, Evas_Object *conte EFL_UI_LAYOUT_CHECK(obj) EINA_FALSE; if (!swallow) { - swallow = elm_widget_default_content_part_get(obj); + swallow = efl_ui_widget_default_content_part_get(obj); if (!swallow) return EINA_FALSE; } else if (!_elm_layout_part_aliasing_eval(obj, &swallow, EINA_FALSE)) @@ -937,7 +937,7 @@ elm_layout_content_get(const Evas_Object *obj, const char *swallow) EFL_UI_LAYOUT_CHECK(obj) NULL; if (!swallow) { - swallow = elm_widget_default_content_part_get(obj); + swallow = efl_ui_widget_default_content_part_get(obj); if (!swallow) return NULL; } else if (!_elm_layout_part_aliasing_eval(obj, &swallow, EINA_FALSE)) @@ -971,7 +971,7 @@ elm_layout_content_unset(Evas_Object *obj, const char *swallow) EFL_UI_LAYOUT_CHECK(obj) NULL; if (!swallow) { - swallow = elm_widget_default_content_part_get(obj); + swallow = efl_ui_widget_default_content_part_get(obj); if (!swallow) return NULL; } else if (!_elm_layout_part_aliasing_eval(obj, &swallow, EINA_FALSE)) @@ -2222,7 +2222,7 @@ elm_layout_text_set(Eo *obj, const char *part, const char *text) { if (!part) { - part = elm_widget_default_text_part_get(obj); + part = efl_ui_widget_default_text_part_get(obj); if (!part) return EINA_FALSE; } else if (!_elm_layout_part_aliasing_eval(obj, &part, EINA_TRUE)) @@ -2237,7 +2237,7 @@ elm_layout_text_get(const Eo *obj, const char *part) { if (!part) { - part = elm_widget_default_text_part_get(obj); + part = efl_ui_widget_default_text_part_get(obj); if (!part) return NULL; } else if (!_elm_layout_part_aliasing_eval(obj, &part, EINA_TRUE)) diff --git a/src/lib/elementary/efl_ui_layout.eo b/src/lib/elementary/efl_ui_layout.eo index 987e205ade..d0d32feab0 100644 --- a/src/lib/elementary/efl_ui_layout.eo +++ b/src/lib/elementary/efl_ui_layout.eo @@ -1,4 +1,4 @@ -class Efl.Ui.Layout (Elm.Widget, Efl.Part, Efl.Container, Efl.File, +class Efl.Ui.Layout (Efl.Ui.Widget, Efl.Part, Efl.Container, Efl.File, Efl.Ui.View, Efl.Ui.Model.Connect, Efl.Ui.Model.Factory.Connect, Efl.Layout.Calc, Efl.Layout.Signal, Efl.Layout.Group) @@ -19,7 +19,7 @@ class Efl.Ui.Layout (Elm.Widget, Efl.Part, Efl.Container, Efl.File, set { [[Sets the edje group from the elementary theme that will be used as layout. Note that $style will be the new style of this object, - as in an @Elm.Widget.style. As a consequence this function can + as in an @Efl.Ui.Widget.style. As a consequence this function can only be called during construction of the object, before finalize. If this returns $false the widget is very likely to become @@ -59,11 +59,11 @@ class Efl.Ui.Layout (Elm.Widget, Efl.Part, Efl.Container, Efl.File, Efl.Layout.Group.group_data { get; } Efl.Layout.Group.group_size_min { get; } Efl.Layout.Group.group_size_max { get; } - Elm.Widget.widget_sub_object_add; - Elm.Widget.theme_apply; - Elm.Widget.on_disabled_update; - Elm.Widget.widget_sub_object_del; - Elm.Widget.on_focus_update; + Efl.Ui.Widget.widget_sub_object_add; + 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.Container.content_count; Efl.Container.content_remove; Efl.Container.content_iterate; diff --git a/src/lib/elementary/efl_ui_list.c b/src/lib/elementary/efl_ui_list.c index 68efe0a7ab..11335b0f60 100644 --- a/src/lib/elementary/efl_ui_list.c +++ b/src/lib/elementary/efl_ui_list.c @@ -667,7 +667,7 @@ _efl_ui_list_efl_canvas_group_group_del(Eo *obj, Efl_Ui_List_Data *pd) } EOLIAN static Efl_Ui_Focus_Manager* -_efl_ui_list_elm_widget_focus_manager_create(Eo *obj EINA_UNUSED, Efl_Ui_List_Data *pd EINA_UNUSED, Efl_Ui_Focus_Object *root) +_efl_ui_list_efl_ui_widget_focus_manager_create(Eo *obj EINA_UNUSED, Efl_Ui_List_Data *pd EINA_UNUSED, Efl_Ui_Focus_Object *root) { if (!pd->manager) pd->manager = efl_add(EFL_UI_FOCUS_MANAGER_CALC_CLASS, obj, diff --git a/src/lib/elementary/efl_ui_list.eo b/src/lib/elementary/efl_ui_list.eo index 72208c814f..2ca88bdf74 100644 --- a/src/lib/elementary/efl_ui_list.eo +++ b/src/lib/elementary/efl_ui_list.eo @@ -85,8 +85,8 @@ class Efl.Ui.List (Efl.Ui.Layout, Efl.Ui.View, Efl.Ui.Scrollable.Interactive, Ef // Elm.Widget.activate; // Elm.Widget.focused_item { get; } // Elm.Widget.focused_object { get; } - Elm.Widget.focus_manager_create; - Elm.Widget.widget_event; + Efl.Ui.Widget.focus_manager_create; + Efl.Ui.Widget.widget_event; // Efl.Ui.Focus.Manager.focus {set; } //Efl.Ui.Layout.sizing_eval; diff --git a/src/lib/elementary/efl_ui_multibuttonentry.c b/src/lib/elementary/efl_ui_multibuttonentry.c index c5304f1246..ca24ed4ff6 100644 --- a/src/lib/elementary/efl_ui_multibuttonentry.c +++ b/src/lib/elementary/efl_ui_multibuttonentry.c @@ -91,7 +91,7 @@ _format_count(int count, void *data EINA_UNUSED) } EOLIAN static Efl_Ui_Theme_Apply -_efl_ui_multibuttonentry_elm_widget_theme_apply(Eo *obj, Efl_Ui_Multibuttonentry_Data *sd) +_efl_ui_multibuttonentry_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Multibuttonentry_Data *sd) { const char *str; int hpad = 0, vpad = 0; @@ -931,7 +931,7 @@ _item_new(Efl_Ui_Multibuttonentry_Data *sd, //FIXME: having an empty event handling function and reacting on Evas //events on specific objects is crazy, someone should fix that. EOLIAN static Eina_Bool -_efl_ui_multibuttonentry_elm_widget_widget_event(Eo *obj EINA_UNUSED, Efl_Ui_Multibuttonentry_Data *sd EINA_UNUSED, const Efl_Event *eo_event EINA_UNUSED, Evas_Object *src EINA_UNUSED) +_efl_ui_multibuttonentry_efl_ui_widget_widget_event(Eo *obj EINA_UNUSED, Efl_Ui_Multibuttonentry_Data *sd EINA_UNUSED, const Efl_Event *eo_event EINA_UNUSED, Evas_Object *src EINA_UNUSED) { // ACCESS if (_elm_config->access_mode == ELM_ACCESS_MODE_ON) return EINA_FALSE; @@ -1630,7 +1630,7 @@ _access_obj_process(Evas_Object *obj, Eina_Bool is_access) } EOLIAN static void -_efl_ui_multibuttonentry_elm_widget_on_access_update(Eo *obj, Efl_Ui_Multibuttonentry_Data *sd EINA_UNUSED, Eina_Bool acs) +_efl_ui_multibuttonentry_efl_ui_widget_on_access_update(Eo *obj, Efl_Ui_Multibuttonentry_Data *sd EINA_UNUSED, Eina_Bool acs) { _efl_ui_multibuttonentry_smart_focus_next_enable = acs; _access_obj_process(obj, _efl_ui_multibuttonentry_smart_focus_next_enable); @@ -1652,12 +1652,12 @@ _legacy_focused(void *data, const Efl_Event *ev) new_focus = efl_ui_focus_manager_focus_get(ev->object); - if (efl_isa(ev->info, ELM_WIDGET_CLASS) && elm_widget_parent_get(ev->info) == pd->box) + if (efl_isa(ev->info, EFL_UI_WIDGET_CLASS) && elm_widget_parent_get(ev->info) == pd->box) { meaningful_focus_out = EINA_TRUE; } - if (efl_isa(new_focus, ELM_WIDGET_CLASS) && elm_widget_parent_get(new_focus) == pd->box) + if (efl_isa(new_focus, EFL_UI_WIDGET_CLASS) && elm_widget_parent_get(new_focus) == pd->box) { meaningful_focus_in = EINA_TRUE; } diff --git a/src/lib/elementary/efl_ui_multibuttonentry.eo b/src/lib/elementary/efl_ui_multibuttonentry.eo index 18654a17d2..a72e41db4f 100644 --- a/src/lib/elementary/efl_ui_multibuttonentry.eo +++ b/src/lib/elementary/efl_ui_multibuttonentry.eo @@ -162,10 +162,10 @@ class Efl.Ui.Multibuttonentry (Efl.Ui.Layout, Efl.Ui.Clickable, Efl.Ui.Format) implements { class.constructor; Efl.Object.constructor; - Elm.Widget.theme_apply; - Elm.Widget.on_access_update; + Efl.Ui.Widget.theme_apply; + Efl.Ui.Widget.on_access_update; Efl.Ui.Translatable.translation_update; - Elm.Widget.widget_event; + Efl.Ui.Widget.widget_event; Efl.Access.children { get; } Efl.Part.part; Efl.Ui.Format.format_cb { set; } diff --git a/src/lib/elementary/efl_ui_nstate.c b/src/lib/elementary/efl_ui_nstate.c index 14313763ef..a555cbcd89 100644 --- a/src/lib/elementary/efl_ui_nstate.c +++ b/src/lib/elementary/efl_ui_nstate.c @@ -116,7 +116,7 @@ _efl_ui_nstate_value_set(Eo *obj, Efl_Ui_Nstate_Data *pd, int state) } EOLIAN static Efl_Ui_Theme_Apply -_efl_ui_nstate_elm_widget_theme_apply(Eo *obj, Efl_Ui_Nstate_Data *pd) +_efl_ui_nstate_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Nstate_Data *pd) { Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; diff --git a/src/lib/elementary/efl_ui_nstate.eo b/src/lib/elementary/efl_ui_nstate.eo index bdf5da9e9d..5780ded0c6 100644 --- a/src/lib/elementary/efl_ui_nstate.eo +++ b/src/lib/elementary/efl_ui_nstate.eo @@ -30,8 +30,8 @@ class Efl.Ui.Nstate(Efl.Ui.Button) implements { class.constructor; Efl.Object.constructor; - Elm.Widget.theme_apply; - Elm.Widget.widget_event; + Efl.Ui.Widget.theme_apply; + Efl.Ui.Widget.widget_event; } events { changed; [[Called when the value changed.]] diff --git a/src/lib/elementary/efl_ui_panes.c b/src/lib/elementary/efl_ui_panes.c index f215387185..da8e405ace 100644 --- a/src/lib/elementary/efl_ui_panes.c +++ b/src/lib/elementary/efl_ui_panes.c @@ -111,7 +111,7 @@ _efl_ui_panes_theme_group_get(Evas_Object *obj, Efl_Ui_Panes_Data *sd) } EOLIAN static Efl_Ui_Theme_Apply -_efl_ui_panes_elm_widget_theme_apply(Eo *obj, Efl_Ui_Panes_Data *sd) +_efl_ui_panes_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Panes_Data *sd) { double size; Evas_Coord minw = 0, minh = 0; diff --git a/src/lib/elementary/efl_ui_panes.eo b/src/lib/elementary/efl_ui_panes.eo index 6d98aae940..f771f22cef 100644 --- a/src/lib/elementary/efl_ui_panes.eo +++ b/src/lib/elementary/efl_ui_panes.eo @@ -47,7 +47,7 @@ class Efl.Ui.Panes (Efl.Ui.Layout, Efl.Ui.Direction, implements { class.constructor; Efl.Object.constructor; - Elm.Widget.theme_apply; + Efl.Ui.Widget.theme_apply; Efl.Ui.Direction.direction { get; set; [[Only supports $vertical and $horizontal. Default is $vertical.]] } Efl.Part.part; } diff --git a/src/lib/elementary/efl_ui_popup.c b/src/lib/elementary/efl_ui_popup.c index c5cf4f54dd..ccb815ad5c 100644 --- a/src/lib/elementary/efl_ui_popup.c +++ b/src/lib/elementary/efl_ui_popup.c @@ -94,7 +94,7 @@ _parent_geom_cb(void *data, const Efl_Event *ev EINA_UNUSED) } EOLIAN static void -_efl_ui_popup_elm_widget_widget_parent_set(Eo *obj, Efl_Ui_Popup_Data *pd EINA_UNUSED, Eo *parent EINA_UNUSED) +_efl_ui_popup_efl_ui_widget_widget_parent_set(Eo *obj, Efl_Ui_Popup_Data *pd EINA_UNUSED, Eo *parent EINA_UNUSED) { pd->win_parent = efl_provider_find(obj, EFL_UI_WIN_CLASS); if (!pd->win_parent) diff --git a/src/lib/elementary/efl_ui_popup.eo b/src/lib/elementary/efl_ui_popup.eo index 62067e74e3..147dd17a3b 100644 --- a/src/lib/elementary/efl_ui_popup.eo +++ b/src/lib/elementary/efl_ui_popup.eo @@ -58,7 +58,7 @@ class Efl.Ui.Popup(Efl.Ui.Layout, Efl.Content) Efl.Gfx.position { set; } Efl.Gfx.size { set;} Efl.Gfx.visible { set; } - Elm.Widget.widget_parent { set; } + Efl.Ui.Widget.widget_parent { set; } Efl.Content.content { get; set; } Efl.Content.content_unset; Efl.Part.part; diff --git a/src/lib/elementary/efl_ui_progressbar.c b/src/lib/elementary/efl_ui_progressbar.c index 19b89332b7..6c41b669e0 100644 --- a/src/lib/elementary/efl_ui_progressbar.c +++ b/src/lib/elementary/efl_ui_progressbar.c @@ -179,7 +179,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) +_efl_ui_progressbar_efl_ui_widget_widget_sub_object_del(Eo *obj, Efl_Ui_Progressbar_Data *pd EINA_UNUSED, Evas_Object *sobj) { if (!efl_ui_widget_sub_object_del(efl_super(obj, MY_CLASS), sobj)) return EINA_FALSE; @@ -189,7 +189,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) +_efl_ui_progressbar_efl_ui_widget_widget_sub_object_add(Eo *obj, Efl_Ui_Progressbar_Data *pd EINA_UNUSED, Evas_Object *sobj) { if (!efl_ui_widget_sub_object_add(efl_super(obj, MY_CLASS), sobj)) return EINA_FALSE; @@ -257,7 +257,7 @@ _efl_ui_progressbar_theme_group_get(Evas_Object *obj, Efl_Ui_Progressbar_Data *s } EOLIAN static Efl_Ui_Theme_Apply -_efl_ui_progressbar_elm_widget_theme_apply(Eo *obj, Efl_Ui_Progressbar_Data *sd) +_efl_ui_progressbar_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Progressbar_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); diff --git a/src/lib/elementary/efl_ui_progressbar.eo b/src/lib/elementary/efl_ui_progressbar.eo index 90d17266ec..0591030fe0 100644 --- a/src/lib/elementary/efl_ui_progressbar.eo +++ b/src/lib/elementary/efl_ui_progressbar.eo @@ -50,9 +50,9 @@ class Efl.Ui.Progressbar (Efl.Ui.Layout, Efl.Ui.Range, Efl.Ui.Format, implements { class.constructor; Efl.Object.constructor; - Elm.Widget.theme_apply; - Elm.Widget.widget_sub_object_add; - Elm.Widget.widget_sub_object_del; + Efl.Ui.Widget.theme_apply; + Efl.Ui.Widget.widget_sub_object_add; + Efl.Ui.Widget.widget_sub_object_del; Efl.Ui.Range.range_value { get; set; } Efl.Ui.Direction.direction { get; set; } Efl.Ui.Format.format_cb { set; } diff --git a/src/lib/elementary/efl_ui_radio.c b/src/lib/elementary/efl_ui_radio.c index cd5c157b3f..51d406c0b9 100644 --- a/src/lib/elementary/efl_ui_radio.c +++ b/src/lib/elementary/efl_ui_radio.c @@ -148,7 +148,7 @@ _icon_signal_emit(Evas_Object *obj) } EOLIAN static Efl_Ui_Theme_Apply -_efl_ui_radio_elm_widget_theme_apply(Eo *obj, Efl_Ui_Radio_Data *sd) +_efl_ui_radio_efl_ui_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; @@ -325,7 +325,7 @@ _efl_ui_radio_selected_object_get(Eo *obj EINA_UNUSED, Efl_Ui_Radio_Data *sd) } EOLIAN static Eina_Bool -_efl_ui_radio_elm_widget_on_access_activate(Eo *obj, Efl_Ui_Radio_Data *_pd EINA_UNUSED, Efl_Ui_Activate act) +_efl_ui_radio_efl_ui_widget_on_access_activate(Eo *obj, Efl_Ui_Radio_Data *_pd EINA_UNUSED, Efl_Ui_Activate act) { if (elm_widget_disabled_get(obj)) return EINA_FALSE; if (act != EFL_UI_ACTIVATE_DEFAULT) return EINA_FALSE; diff --git a/src/lib/elementary/efl_ui_radio.eo b/src/lib/elementary/efl_ui_radio.eo index ce51b183e1..35602e806b 100644 --- a/src/lib/elementary/efl_ui_radio.eo +++ b/src/lib/elementary/efl_ui_radio.eo @@ -62,9 +62,9 @@ class Efl.Ui.Radio (Efl.Ui.Check, Efl.Access.Widget.Action, Efl.Content) class.constructor; Efl.Object.constructor; Efl.Object.destructor; - Elm.Widget.theme_apply; - Elm.Widget.on_access_activate; - Elm.Widget.widget_event; + Efl.Ui.Widget.theme_apply; + Efl.Ui.Widget.on_access_activate; + Efl.Ui.Widget.widget_event; Efl.Access.state_set { get; } Efl.Access.Widget.Action.elm_actions { get; } Efl.Content.content { get; set; } diff --git a/src/lib/elementary/efl_ui_scroller.c b/src/lib/elementary/efl_ui_scroller.c index e10d5b6cce..83e3f96e92 100644 --- a/src/lib/elementary/efl_ui_scroller.c +++ b/src/lib/elementary/efl_ui_scroller.c @@ -514,7 +514,7 @@ _efl_ui_scroller_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Scroller_Data *sd) } EOLIAN static Efl_Ui_Theme_Apply -_efl_ui_scroller_elm_widget_theme_apply(Eo *obj, Efl_Ui_Scroller_Data *sd) +_efl_ui_scroller_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Scroller_Data *sd) { Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); diff --git a/src/lib/elementary/efl_ui_scroller.eo b/src/lib/elementary/efl_ui_scroller.eo index 805e0de207..fd73d8cfc3 100644 --- a/src/lib/elementary/efl_ui_scroller.eo +++ b/src/lib/elementary/efl_ui_scroller.eo @@ -10,7 +10,7 @@ class Efl.Ui.Scroller (Efl.Ui.Layout, Efl.Object.finalize; Efl.Object.destructor; Efl.Content.content { set; } - Elm.Widget.theme_apply; + Efl.Ui.Widget.theme_apply; Efl.Ui.Scrollable.Interactive.content_size{ get; } Efl.Ui.Scrollable.Interactive.viewport_geometry{ get; } Efl.Ui.Scrollable.Interactive.bounce_enabled { set; get; } diff --git a/src/lib/elementary/efl_ui_slider.c b/src/lib/elementary/efl_ui_slider.c index d316278172..e385867f52 100644 --- a/src/lib/elementary/efl_ui_slider.c +++ b/src/lib/elementary/efl_ui_slider.c @@ -526,17 +526,17 @@ _wheel_indicator_timer_cb(void *data) return ECORE_CALLBACK_CANCEL; } -// _slider_elm_widget_widget_event +// _slider_efl_ui_widget_widget_event ELM_WIDGET_KEY_DOWN_DEFAULT_IMPLEMENT(slider, Efl_Ui_Slider_Data) EOLIAN static Eina_Bool -_efl_ui_slider_elm_widget_widget_event(Eo *obj, Efl_Ui_Slider_Data *sd, const Efl_Event *eo_event, Evas_Object *src) +_efl_ui_slider_efl_ui_widget_widget_event(Eo *obj, Efl_Ui_Slider_Data *sd, const Efl_Event *eo_event, Evas_Object *src) { Eo *ev = eo_event->info; if (eo_event->desc == EFL_EVENT_KEY_DOWN) { - if (!_slider_elm_widget_widget_event(obj, sd, eo_event, src)) + if (!_slider_efl_ui_widget_widget_event(obj, sd, eo_event, src)) return EINA_FALSE; } else if (eo_event->desc == EFL_EVENT_KEY_UP) @@ -565,7 +565,7 @@ _efl_ui_slider_elm_widget_widget_event(Eo *obj, Efl_Ui_Slider_Data *sd, const Ef } EOLIAN static Eina_Bool -_efl_ui_slider_elm_widget_on_access_activate(Eo *obj, Efl_Ui_Slider_Data *sd, Efl_Ui_Activate act) +_efl_ui_slider_efl_ui_widget_on_access_activate(Eo *obj, Efl_Ui_Slider_Data *sd, Efl_Ui_Activate act) { if (elm_widget_disabled_get(obj)) return EINA_FALSE; if (act == EFL_UI_ACTIVATE_DEFAULT) return EINA_FALSE; @@ -779,7 +779,7 @@ _efl_ui_slider_theme_group_get(Evas_Object *obj, Efl_Ui_Slider_Data *sd) } EOLIAN static Efl_Ui_Theme_Apply -_efl_ui_slider_elm_widget_theme_apply(Eo *obj, Efl_Ui_Slider_Data *sd) +_efl_ui_slider_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Slider_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); @@ -1299,7 +1299,7 @@ _efl_ui_slider_step_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *sd) } EOLIAN static Eina_Bool -_efl_ui_slider_elm_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, Elm_Object_Item *item EINA_UNUSED) { Eina_Bool int_ret = EINA_FALSE; diff --git a/src/lib/elementary/efl_ui_slider.eo b/src/lib/elementary/efl_ui_slider.eo index 6a464cf4ff..55007f3e24 100644 --- a/src/lib/elementary/efl_ui_slider.eo +++ b/src/lib/elementary/efl_ui_slider.eo @@ -37,10 +37,10 @@ class Efl.Ui.Slider (Efl.Ui.Layout, Efl.Ui.Range, Efl.Ui.Direction, class.constructor; Efl.Object.constructor; Efl.Canvas.Group.group_calculate; - Elm.Widget.theme_apply; - Elm.Widget.on_access_activate; - Elm.Widget.on_focus_update; - Elm.Widget.widget_event; + Efl.Ui.Widget.theme_apply; + Efl.Ui.Widget.on_access_activate; + Efl.Ui.Widget.on_focus_update; + Efl.Ui.Widget.widget_event; Efl.Ui.Range.range_value { get; set; } Efl.Ui.Range.range_min_max {get; set; } Efl.Ui.Direction.direction { get; set; } diff --git a/src/lib/elementary/efl_ui_spin.c b/src/lib/elementary/efl_ui_spin.c index d24d20d309..ad73ab4d0f 100644 --- a/src/lib/elementary/efl_ui_spin.c +++ b/src/lib/elementary/efl_ui_spin.c @@ -151,7 +151,7 @@ _efl_ui_spin_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Spin_Data *_pd EINA_UNUSED) } EOLIAN static Eina_Bool -_efl_ui_spin_elm_widget_widget_event(Eo *obj, Efl_Ui_Spin_Data *sd, const Efl_Event *eo_event, Evas_Object *src EINA_UNUSED) +_efl_ui_spin_efl_ui_widget_widget_event(Eo *obj, Efl_Ui_Spin_Data *sd, const Efl_Event *eo_event, Evas_Object *src EINA_UNUSED) { Eo *ev = eo_event->info; diff --git a/src/lib/elementary/efl_ui_spin.eo b/src/lib/elementary/efl_ui_spin.eo index 20b33a0871..d88e42d870 100644 --- a/src/lib/elementary/efl_ui_spin.eo +++ b/src/lib/elementary/efl_ui_spin.eo @@ -11,7 +11,7 @@ class Efl.Ui.Spin (Efl.Ui.Layout, Efl.Ui.Range, Efl.Ui.Format, implements { Efl.Object.constructor; Efl.Object.destructor; - Elm.Widget.widget_event; + Efl.Ui.Widget.widget_event; Efl.Ui.Range.range_min_max { get; set; } Efl.Ui.Range.range_step { get; set; } Efl.Ui.Range.range_value { get; set; } diff --git a/src/lib/elementary/efl_ui_spin_button.c b/src/lib/elementary/efl_ui_spin_button.c index 73d71cb861..6fa35c6e23 100644 --- a/src/lib/elementary/efl_ui_spin_button.c +++ b/src/lib/elementary/efl_ui_spin_button.c @@ -536,7 +536,7 @@ _key_action_toggle(Evas_Object *obj, const char *params EINA_UNUSED) } EOLIAN static Eina_Bool -_efl_ui_spin_button_elm_widget_widget_event(Eo *obj, Efl_Ui_Spin_Button_Data *sd EINA_UNUSED, const Efl_Event *eo_event, Evas_Object *src EINA_UNUSED) +_efl_ui_spin_button_efl_ui_widget_widget_event(Eo *obj, Efl_Ui_Spin_Button_Data *sd EINA_UNUSED, const Efl_Event *eo_event, Evas_Object *src EINA_UNUSED) { Eo *ev = eo_event->info; @@ -568,7 +568,7 @@ _efl_ui_spin_button_elm_widget_widget_event(Eo *obj, Efl_Ui_Spin_Button_Data *sd } EOLIAN static Eina_Bool -_efl_ui_spin_button_elm_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, Elm_Object_Item *item EINA_UNUSED) { Eina_Bool int_ret = EINA_FALSE; @@ -714,7 +714,7 @@ _access_spinner_register(Evas_Object *obj, Eina_Bool is_access) } EOLIAN static Efl_Ui_Theme_Apply -_efl_ui_spin_button_elm_widget_theme_apply(Eo *obj, Efl_Ui_Spin_Button_Data *sd EINA_UNUSED) +_efl_ui_spin_button_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Spin_Button_Data *sd EINA_UNUSED) { Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; diff --git a/src/lib/elementary/efl_ui_spin_button.eo b/src/lib/elementary/efl_ui_spin_button.eo index c6b88a01b7..581e0b493f 100644 --- a/src/lib/elementary/efl_ui_spin_button.eo +++ b/src/lib/elementary/efl_ui_spin_button.eo @@ -64,9 +64,9 @@ class Efl.Ui.Spin_Button (Efl.Ui.Spin, Efl.Ui.Focus.Composition, } implements { Efl.Object.constructor; - Elm.Widget.theme_apply; - Elm.Widget.widget_event; - Elm.Widget.on_focus_update; + Efl.Ui.Widget.theme_apply; + Efl.Ui.Widget.widget_event; + Efl.Ui.Widget.on_focus_update; Efl.Ui.Range.range_value { set; } Efl.Access.name { get; } Efl.Access.Value.value_and_text { get; set; } diff --git a/src/lib/elementary/efl_ui_table.c b/src/lib/elementary/efl_ui_table.c index 39aa7b87f5..c1ce6786e2 100644 --- a/src/lib/elementary/efl_ui_table.c +++ b/src/lib/elementary/efl_ui_table.c @@ -29,7 +29,7 @@ _mirrored_set(Evas_Object *obj, Eina_Bool rtl) } EOLIAN static Efl_Ui_Theme_Apply -_efl_ui_table_elm_widget_theme_apply(Eo *obj, Efl_Ui_Table_Data *pd EINA_UNUSED) +_efl_ui_table_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Table_Data *pd EINA_UNUSED) { Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); diff --git a/src/lib/elementary/efl_ui_table.eo b/src/lib/elementary/efl_ui_table.eo index 77086e726e..7782c43c3d 100644 --- a/src/lib/elementary/efl_ui_table.eo +++ b/src/lib/elementary/efl_ui_table.eo @@ -1,11 +1,11 @@ -class Efl.Ui.Table (Elm.Widget, Efl.Pack.Table, Efl.Pack.Layout, +class Efl.Ui.Table (Efl.Ui.Widget, Efl.Pack.Table, Efl.Pack.Layout, Efl.Ui.Direction) { [[Efl UI table class]] implements { Efl.Object.constructor; Efl.Canvas.Group.group_calculate; - Elm.Widget.theme_apply; + Efl.Ui.Widget.theme_apply; //Efl.Container.content_remove; // TODO Efl.Container.content_iterate; Efl.Container.content_count; diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c index 4f3e45f7df..43146f5490 100644 --- a/src/lib/elementary/efl_ui_text.c +++ b/src/lib/elementary/efl_ui_text.c @@ -792,7 +792,7 @@ _get_drop_format(Evas_Object *obj) /* we can't reuse layout's here, because it's on entry_edje only */ EOLIAN static Eina_Bool -_efl_ui_text_elm_widget_on_disabled_update(Eo *obj, Efl_Ui_Text_Data *sd, Eina_Bool disabled) +_efl_ui_text_efl_ui_widget_on_disabled_update(Eo *obj, Efl_Ui_Text_Data *sd, Eina_Bool disabled) { const char *emission ; @@ -852,7 +852,7 @@ _efl_ui_text_background_switch(Evas_Object *from_edje, Evas_Object *to_edje) /* we can't issue the layout's theming code here, cause it assumes an * unique edje object, always */ EOLIAN static Efl_Ui_Theme_Apply -_efl_ui_text_elm_widget_theme_apply(Eo *obj, Efl_Ui_Text_Data *sd) +_efl_ui_text_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Text_Data *sd) { const char *str; Efl_Ui_Theme_Apply theme_apply; @@ -861,7 +861,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 = efl_ui_widget_theme_apply(efl_cast(obj, ELM_WIDGET_CLASS)); + theme_apply = efl_ui_widget_theme_apply(efl_cast(obj, EFL_UI_WIDGET_CLASS)); if (!theme_apply) return EFL_UI_THEME_APPLY_FAILED; efl_event_freeze(obj); @@ -1126,7 +1126,7 @@ _return_key_enabled_check(Evas_Object *obj) } EOLIAN static Eina_Bool -_efl_ui_text_elm_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, Elm_Object_Item *item EINA_UNUSED) { Evas_Object *top; Eina_Bool top_is_win = EINA_FALSE; @@ -1185,7 +1185,7 @@ _efl_ui_text_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Text_Data *sd, Elm_Objec } EOLIAN static Eina_Rect -_efl_ui_text_elm_widget_interest_region_get(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd) +_efl_ui_text_efl_ui_widget_interest_region_get(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd) { Evas_Coord edje_x, edje_y, elm_x, elm_y; Eina_Rect r = {}; @@ -1220,7 +1220,7 @@ _show_region_hook(void *data EINA_UNUSED, Evas_Object *obj, Eina_Rect r) } EOLIAN static Eina_Bool -_efl_ui_text_elm_widget_widget_sub_object_del(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, Evas_Object *sobj) +_efl_ui_text_efl_ui_widget_widget_sub_object_del(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, Evas_Object *sobj) { Eina_Bool ret = EINA_FALSE; /* unfortunately entry doesn't follow the signal pattern @@ -3968,7 +3968,7 @@ _efl_ui_text_anchor_hover_end(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd) /* END - ANCHOR HOVER */ EOLIAN static Eina_Bool -_efl_ui_text_elm_widget_on_access_activate(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, Efl_Ui_Activate act) +_efl_ui_text_efl_ui_widget_on_access_activate(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, Efl_Ui_Activate act) { if (act != EFL_UI_ACTIVATE_DEFAULT) return EINA_FALSE; diff --git a/src/lib/elementary/efl_ui_text.eo b/src/lib/elementary/efl_ui_text.eo index 5075af5f68..7df95dbceb 100644 --- a/src/lib/elementary/efl_ui_text.eo +++ b/src/lib/elementary/efl_ui_text.eo @@ -357,12 +357,12 @@ class Efl.Ui.Text (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable, Efl.Layout.Signal.signal_callback_add; Efl.Layout.Signal.signal_callback_del; Efl.Layout.Signal.signal_emit; - Elm.Widget.on_access_activate; - Elm.Widget.theme_apply; - Elm.Widget.on_focus_update; - Elm.Widget.interest_region { get; } - Elm.Widget.on_disabled_update; - Elm.Widget.widget_sub_object_del; + Efl.Ui.Widget.on_access_activate; + Efl.Ui.Widget.theme_apply; + Efl.Ui.Widget.on_focus_update; + Efl.Ui.Widget.interest_region { get; } + Efl.Ui.Widget.on_disabled_update; + Efl.Ui.Widget.widget_sub_object_del; Elm.Interface_Scrollable.policy { set; } Elm.Interface_Scrollable.bounce_allow { set; } Efl.Access.state_set { get; } diff --git a/src/lib/elementary/efl_ui_textpath.c b/src/lib/elementary/efl_ui_textpath.c index 9a64896521..f133de5b31 100644 --- a/src/lib/elementary/efl_ui_textpath.c +++ b/src/lib/elementary/efl_ui_textpath.c @@ -543,7 +543,7 @@ _efl_ui_textpath_efl_text_text_get(Eo *obj EINA_UNUSED, Efl_Ui_Textpath_Data *pd } EOLIAN static Efl_Ui_Theme_Apply -_efl_ui_textpath_elm_widget_theme_apply(Eo *obj, Efl_Ui_Textpath_Data *pd) +_efl_ui_textpath_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Textpath_Data *pd) { Efl_Ui_Theme_Apply ret = EFL_UI_THEME_APPLY_FAILED; diff --git a/src/lib/elementary/efl_ui_textpath.eo b/src/lib/elementary/efl_ui_textpath.eo index 9c8faf9344..40743bba80 100644 --- a/src/lib/elementary/efl_ui_textpath.eo +++ b/src/lib/elementary/efl_ui_textpath.eo @@ -51,7 +51,7 @@ class Efl.Ui.Textpath (Efl.Ui.Layout, Efl.Object, Efl.Text, Efl.Gfx.Path) Efl.Canvas.Group.group_calculate; Efl.Text.text {get; set;} Efl.Part.part; - Elm.Widget.theme_apply; + Efl.Ui.Widget.theme_apply; Efl.Gfx.position { set; } Efl.Gfx.size { set; } } diff --git a/src/lib/elementary/efl_ui_video.eo b/src/lib/elementary/efl_ui_video.eo index f5a7940768..87d4b586b3 100644 --- a/src/lib/elementary/efl_ui_video.eo +++ b/src/lib/elementary/efl_ui_video.eo @@ -64,7 +64,7 @@ class Efl.Ui.Video (Efl.Ui.Layout, Efl.File, class.constructor; Efl.Object.constructor; Efl.File.file { get; set; } - Elm.Widget.widget_event; + Efl.Ui.Widget.widget_event; Efl.Access.Widget.Action.elm_actions { get; } } } diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/efl_ui_widget.c index 3d908f1209..4767f9a32f 100644 --- a/src/lib/elementary/elm_widget.c +++ b/src/lib/elementary/efl_ui_widget.c @@ -24,9 +24,9 @@ #define EFL_INTERNAL_UNSTABLE #include "interfaces/efl_common_internal.h" -#define MY_CLASS ELM_WIDGET_CLASS +#define MY_CLASS EFL_UI_WIDGET_CLASS -#define MY_CLASS_NAME "Elm_Widget" +#define MY_CLASS_NAME "Efl_Ui_Widget" #define MY_CLASS_NAME_LEGACY "elm_widget" #define ELM_WIDGET_DATA_GET(o, wd) \ @@ -42,7 +42,7 @@ if (!sd) return #define ELM_WIDGET_FOCUS_GET(obj) \ - (efl_isa(obj, ELM_WIDGET_CLASS) && \ + (efl_isa(obj, EFL_UI_WIDGET_CLASS) && \ ((_elm_access_auto_highlight_get()) ? (elm_widget_highlight_get(obj)) : \ (efl_ui_focus_object_focus_get(obj)))) @@ -114,7 +114,7 @@ static void _on_sub_obj_del(void *data, const Efl_Event *event); static void _propagate_event(void *data, const Efl_Event *eo_event); static void _elm_widget_focus_tree_unfocusable_handle(Eo *obj); -static void _elm_widget_shadow_update(Elm_Widget *obj); +static void _elm_widget_shadow_update(Efl_Ui_Widget *obj); EFL_CALLBACKS_ARRAY_DEFINE(elm_widget_subitems_callbacks, { EFL_EVENT_DEL, _on_sub_obj_del }); @@ -184,7 +184,7 @@ _elm_widget_focus_highlight_start(const Evas_Object *obj) } Evas_Object * -_elm_widget_focus_highlight_object_get(const Evas_Object *obj) +_efl_ui_widget_focus_highlight_object_get(const Evas_Object *obj) { Evas_Object *top = elm_widget_top_get(obj); @@ -194,7 +194,7 @@ _elm_widget_focus_highlight_object_get(const Evas_Object *obj) } EOLIAN static Eina_Bool -_elm_widget_focus_highlight_enabled_get(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED) +_efl_ui_widget_focus_highlight_enabled_get(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED) { // Forward to closest parent Window const Evas_Object *win = elm_widget_top_get(obj); @@ -206,7 +206,7 @@ _elm_widget_focus_highlight_enabled_get(Eo *obj, Elm_Widget_Smart_Data *sd EINA_ } EOLIAN static void -_elm_widget_focus_highlight_enabled_set(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED, Eina_Bool enable) +_efl_ui_widget_focus_highlight_enabled_set(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED, Eina_Bool enable) { // Forward to closest parent Window Evas_Object *win = elm_widget_top_get(obj); @@ -216,7 +216,7 @@ _elm_widget_focus_highlight_enabled_set(Eo *obj, Elm_Widget_Smart_Data *sd EINA_ } EOLIAN static Eina_Bool -_elm_widget_focus_highlight_animate_get(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED) +_efl_ui_widget_focus_highlight_animate_get(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED) { // Forward to closest parent Window const Evas_Object *win = elm_widget_top_get(obj); @@ -228,7 +228,7 @@ _elm_widget_focus_highlight_animate_get(Eo *obj, Elm_Widget_Smart_Data *sd EINA_ } EOLIAN static void -_elm_widget_focus_highlight_animate_set(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED, Eina_Bool enable) +_efl_ui_widget_focus_highlight_animate_set(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED, Eina_Bool enable) { // Forward to closest parent Window Evas_Object *win = elm_widget_top_get(obj); @@ -238,7 +238,7 @@ _elm_widget_focus_highlight_animate_set(Eo *obj, Elm_Widget_Smart_Data *sd EINA_ } EOLIAN static Eina_Bool -_elm_widget_focus_highlight_style_set(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED, const char *style) +_efl_ui_widget_focus_highlight_style_set(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED, const char *style) { // Forward to closest parent Window Evas_Object *win = elm_widget_top_get(obj); @@ -250,7 +250,7 @@ _elm_widget_focus_highlight_style_set(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UN } EOLIAN static const char * -_elm_widget_focus_highlight_style_get(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED) +_efl_ui_widget_focus_highlight_style_get(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED) { // Forward to closest parent Window Evas_Object *win = elm_widget_top_get(obj); @@ -264,7 +264,7 @@ _elm_widget_focus_highlight_style_get(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UN static Eina_Bool _tree_unfocusable(Eo *obj) { - Elm_Widget *wid = obj; + Efl_Ui_Widget *wid = obj; do { ELM_WIDGET_DATA_GET(wid, wid_pd); @@ -278,7 +278,7 @@ _tree_unfocusable(Eo *obj) static Eina_Bool _tree_disabled(Eo *obj) { - Elm_Widget *wid = obj; + Efl_Ui_Widget *wid = obj; do { ELM_WIDGET_DATA_GET(wid, wid_pd); @@ -335,7 +335,7 @@ _focus_manager_eval(Eo *obj, Elm_Widget_Smart_Data *pd) } EOLIAN static Eina_Bool -_elm_widget_focus_state_apply(Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED, Efl_Ui_Widget_Focus_State current_state, Efl_Ui_Widget_Focus_State *configured_state, Elm_Widget *redirect) +_efl_ui_widget_focus_state_apply(Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED, Efl_Ui_Widget_Focus_State current_state, Efl_Ui_Widget_Focus_State *configured_state, Efl_Ui_Widget *redirect) { Eina_Bool registered = EINA_TRUE; @@ -451,7 +451,7 @@ _focus_state_eval(Eo *obj, Elm_Widget_Smart_Data *pd, Eina_Bool should, Eina_Boo static Efl_Ui_Focus_Object* _logical_parent_eval(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd, Eina_Bool should) { - Elm_Widget *parent; + Efl_Ui_Widget *parent; Efl_Ui_Focus_Parent_Provider *provider; if (should) @@ -471,7 +471,7 @@ _logical_parent_eval(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd, Eina_Bool s //update old logical parent; if (pd->logical.parent) { - if (efl_isa(pd->logical.parent, ELM_WIDGET_CLASS)) + if (efl_isa(pd->logical.parent, EFL_UI_WIDGET_CLASS)) { ELM_WIDGET_DATA_GET(pd->logical.parent, logical_wd); if (!logical_wd) @@ -487,7 +487,7 @@ _logical_parent_eval(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd, Eina_Bool s } if (parent) { - if (efl_isa(parent, ELM_WIDGET_CLASS)) + if (efl_isa(parent, EFL_UI_WIDGET_CLASS)) { ELM_WIDGET_DATA_GET(parent, parent_wd); if (!parent_wd) @@ -517,14 +517,14 @@ _full_eval(Eo *obj, Elm_Widget_Smart_Data *pd) old_parent = _logical_parent_eval(obj, pd, should); - if (efl_isa(old_parent, ELM_WIDGET_CLASS)) + if (efl_isa(old_parent, EFL_UI_WIDGET_CLASS)) { //emit signal and focus eval old and new ELM_WIDGET_DATA_GET(old_parent, old_pd); _full_eval(old_parent, old_pd); } - if (efl_isa(pd->logical.parent, ELM_WIDGET_CLASS)) + if (efl_isa(pd->logical.parent, EFL_UI_WIDGET_CLASS)) { ELM_WIDGET_DATA_GET(pd->logical.parent, new_pd); _full_eval(pd->logical.parent, new_pd); @@ -702,7 +702,7 @@ _obj_mouse_in(void *data, } EOLIAN static void -_elm_widget_efl_canvas_group_group_add(Eo *obj, Elm_Widget_Smart_Data *priv) +_efl_ui_widget_efl_canvas_group_group_add(Eo *obj, Elm_Widget_Smart_Data *priv) { priv->obj = obj; @@ -725,7 +725,7 @@ _elm_widget_efl_canvas_group_group_add(Eo *obj, Elm_Widget_Smart_Data *priv) } EOLIAN static void -_elm_widget_efl_canvas_group_group_del(Eo *obj, Elm_Widget_Smart_Data *sd) +_efl_ui_widget_efl_canvas_group_group_del(Eo *obj, Elm_Widget_Smart_Data *sd) { Evas_Object *sobj; Elm_Translate_String_Data *ts; @@ -801,7 +801,7 @@ _smart_reconfigure(Elm_Widget_Smart_Data *sd) } EOLIAN static void -_elm_widget_efl_gfx_position_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Eina_Position2D pos) +_efl_ui_widget_efl_gfx_position_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Eina_Position2D pos) { if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y)) return; @@ -814,7 +814,7 @@ _elm_widget_efl_gfx_position_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, } EOLIAN static void -_elm_widget_efl_gfx_size_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Eina_Size2D sz) +_efl_ui_widget_efl_gfx_size_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Eina_Size2D sz) { if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h)) return; @@ -838,15 +838,15 @@ _full_eval_children(Eo *obj, Elm_Widget_Smart_Data *sd) { Elm_Widget_Smart_Data *sd_child; - if (!efl_isa(child, ELM_WIDGET_CLASS)) continue; + if (!efl_isa(child, EFL_UI_WIDGET_CLASS)) continue; - sd_child = efl_data_scope_get(child, ELM_WIDGET_CLASS); + sd_child = efl_data_scope_get(child, EFL_UI_WIDGET_CLASS); _full_eval_children(child, sd_child); } } EOLIAN static void -_elm_widget_efl_gfx_visible_set(Eo *obj, Elm_Widget_Smart_Data *pd, Eina_Bool vis) +_efl_ui_widget_efl_gfx_visible_set(Eo *obj, Elm_Widget_Smart_Data *pd, Eina_Bool vis) { Eina_Iterator *it; Evas_Object *o; @@ -886,7 +886,7 @@ _elm_widget_efl_gfx_visible_set(Eo *obj, Elm_Widget_Smart_Data *pd, Eina_Bool vi } EOLIAN static void -_elm_widget_efl_gfx_color_color_set(Eo *obj, Elm_Widget_Smart_Data *pd, int r, int g, int b, int a) +_efl_ui_widget_efl_gfx_color_color_set(Eo *obj, Elm_Widget_Smart_Data *pd, int r, int g, int b, int a) { Eina_Iterator *it; Evas_Object *o; @@ -905,7 +905,7 @@ _elm_widget_efl_gfx_color_color_set(Eo *obj, Elm_Widget_Smart_Data *pd, int r, i } EOLIAN static void -_elm_widget_efl_canvas_object_no_render_set(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Eina_Bool hide) +_efl_ui_widget_efl_canvas_object_no_render_set(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Eina_Bool hide) { Eina_Iterator *it; Evas_Object *o; @@ -927,7 +927,7 @@ _elm_widget_efl_canvas_object_no_render_set(Eo *obj, Elm_Widget_Smart_Data *_pd } EOLIAN static void -_elm_widget_efl_canvas_object_is_frame_object_set(Eo *obj, Elm_Widget_Smart_Data *pd, Eina_Bool frame) +_efl_ui_widget_efl_canvas_object_is_frame_object_set(Eo *obj, Elm_Widget_Smart_Data *pd, Eina_Bool frame) { Evas_Object *o; Eina_List *li; @@ -942,7 +942,7 @@ _elm_widget_efl_canvas_object_is_frame_object_set(Eo *obj, Elm_Widget_Smart_Data } EOLIAN static void -_elm_widget_efl_canvas_object_clip_set(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Evas_Object *clip) +_efl_ui_widget_efl_canvas_object_clip_set(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Evas_Object *clip) { Eina_Iterator *it; Evas_Object *o; @@ -962,13 +962,13 @@ _elm_widget_efl_canvas_object_clip_set(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_ } EOLIAN static void -_elm_widget_efl_canvas_group_group_calculate(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED) +_efl_ui_widget_efl_canvas_group_group_calculate(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED) { /* a NO-OP, on the base */ } EOLIAN static void -_elm_widget_efl_canvas_group_group_member_add(Eo *obj, Elm_Widget_Smart_Data *pd, Evas_Object *child) +_efl_ui_widget_efl_canvas_group_group_member_add(Eo *obj, Elm_Widget_Smart_Data *pd, Evas_Object *child) { int r, g, b, a; efl_canvas_group_member_add(efl_super(obj, MY_CLASS), child); @@ -991,7 +991,7 @@ _elm_widget_efl_canvas_group_group_member_add(Eo *obj, Elm_Widget_Smart_Data *pd } EOLIAN static void -_elm_widget_efl_canvas_group_group_member_del(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Evas_Object *child) +_efl_ui_widget_efl_canvas_group_group_member_del(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Evas_Object *child) { if (!evas_object_data_get(child, "_elm_leaveme")) evas_object_clip_unset(child); @@ -1142,7 +1142,7 @@ elm_widget_focus_region_show(Eo *obj) } EOLIAN static void -_elm_widget_widget_parent_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Evas_Object *parent EINA_UNUSED) +_efl_ui_widget_widget_parent_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Evas_Object *parent EINA_UNUSED) { } @@ -1179,7 +1179,7 @@ elm_widget_access(Evas_Object *obj, } EOLIAN static void -_elm_widget_on_access_update(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Eina_Bool is_access EINA_UNUSED) +_efl_ui_widget_on_access_update(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Eina_Bool is_access EINA_UNUSED) { } @@ -1256,7 +1256,7 @@ elm_widget_theme_specific(Evas_Object *obj, } EOLIAN static Efl_Ui_Theme_Apply -_elm_widget_theme_apply(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED) +_efl_ui_widget_theme_apply(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED) { _elm_widget_mirrored_reload(obj); if (elm_widget_disabled_get(obj)) @@ -1275,7 +1275,7 @@ _elm_widget_theme_apply(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED) * **/ EOLIAN static Eina_Bool -_elm_widget_efl_ui_base_mirrored_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) +_efl_ui_widget_efl_ui_base_mirrored_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) { return sd->is_mirrored; } @@ -1289,7 +1289,7 @@ _elm_widget_efl_ui_base_mirrored_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data * @param mirrored EINA_TRUE to set mirrored mode. EINA_FALSE to unset. */ EOLIAN static void -_elm_widget_efl_ui_base_mirrored_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool mirrored) +_efl_ui_widget_efl_ui_base_mirrored_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool mirrored) { mirrored = !!mirrored; @@ -1307,7 +1307,7 @@ _elm_widget_efl_ui_base_mirrored_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bo * **/ EOLIAN static Eina_Bool -_elm_widget_efl_ui_base_mirrored_automatic_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) +_efl_ui_widget_efl_ui_base_mirrored_automatic_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) { return sd->mirrored_auto_mode; } @@ -1322,7 +1322,7 @@ _elm_widget_efl_ui_base_mirrored_automatic_get(Eo *obj EINA_UNUSED, Elm_Widget_S * @param automatic EINA_TRUE for auto mirrored mode. EINA_FALSE for manual. */ EOLIAN static void -_elm_widget_efl_ui_base_mirrored_automatic_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool automatic) +_efl_ui_widget_efl_ui_base_mirrored_automatic_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool automatic) { if (sd->mirrored_auto_mode != automatic) { @@ -1336,7 +1336,7 @@ _elm_widget_efl_ui_base_mirrored_automatic_set(Eo *obj, Elm_Widget_Smart_Data *s } EOLIAN static void -_elm_widget_on_show_region_hook_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, void *data, Efl_Ui_Scrollable_On_Show_Region func, Eina_Free_Cb func_free_cb) +_efl_ui_widget_on_show_region_hook_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, void *data, Efl_Ui_Scrollable_On_Show_Region func, Eina_Free_Cb func_free_cb) { if ((sd->on_show_region_data == data) && (sd->on_show_region == func)) return; @@ -1362,7 +1362,7 @@ elm_widget_sub_object_parent_add(Evas_Object *sobj) Eo *parent = NULL; parent = efl_parent_get(sobj); - if (!efl_isa(parent, ELM_WIDGET_CLASS)) + if (!efl_isa(parent, EFL_UI_WIDGET_CLASS)) { ERR("You passed a wrong parent parameter (%p %s). " "Elementary widget's parent should be an elementary widget.", parent, evas_object_type_get(parent)); @@ -1386,7 +1386,7 @@ elm_widget_sub_object_parent_add(Evas_Object *sobj) * @see elm_widget_sub_object_parent_add() */ EOLIAN static Eina_Bool -_elm_widget_widget_sub_object_add(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Object *sobj) +_efl_ui_widget_widget_sub_object_add(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Object *sobj) { Eina_Bool mirrored, pmirrored = efl_ui_mirrored_get(obj); @@ -1507,7 +1507,7 @@ end: } EOLIAN static Eina_Bool -_elm_widget_widget_sub_object_del(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Object *sobj) +_efl_ui_widget_widget_sub_object_del(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Object *sobj) { Evas_Object *sobj_parent; @@ -1596,7 +1596,7 @@ _elm_widget_widget_sub_object_del(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Objec /* protected function - for widget developers only */ EOLIAN static void -_elm_widget_resize_object_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eo *sobj) +_efl_ui_widget_resize_object_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eo *sobj) { Evas_Object *parent; @@ -1666,7 +1666,7 @@ elm_widget_hover_object_set(Eo *obj, Evas_Object *sobj) } EOLIAN static void -_elm_widget_focus_allow_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool can_focus) +_efl_ui_widget_focus_allow_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool can_focus) { can_focus = !!can_focus; @@ -1720,7 +1720,7 @@ _elm_widget_focus_allow_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool can_fo } EOLIAN static Eina_Bool -_elm_widget_focus_allow_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) +_efl_ui_widget_focus_allow_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) { return sd->can_focus; } @@ -1907,12 +1907,12 @@ elm_widget_highlight_get(const Eo *obj) } EOLIAN static Evas_Object* -_elm_widget_widget_top_get(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED) +_efl_ui_widget_widget_top_get(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED) { - Elm_Widget *parent = elm_widget_parent_get(obj); + Efl_Ui_Widget *parent = elm_widget_parent_get(obj); if (parent) { - if (!efl_isa(parent, ELM_WIDGET_CLASS)) return NULL; + if (!efl_isa(parent, EFL_UI_WIDGET_CLASS)) return NULL; return efl_ui_widget_top_get(parent); } return obj; @@ -2360,7 +2360,7 @@ elm_widget_parent_highlight_set(Eo *obj, Eina_Bool highlighted) } EOLIAN static Evas_Object* -_elm_widget_widget_parent_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) +_efl_ui_widget_widget_parent_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) { return sd->parent_obj; } @@ -2427,7 +2427,7 @@ elm_widget_disabled_internal(Eo *obj, Eina_Bool disabled) } EOLIAN static void -_elm_widget_disabled_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool disabled) +_efl_ui_widget_disabled_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool disabled) { if (sd->disabled == disabled) return; sd->disabled = !!disabled; @@ -2439,14 +2439,14 @@ _elm_widget_disabled_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool disabled) } EOLIAN static Eina_Bool -_elm_widget_disabled_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) +_efl_ui_widget_disabled_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) { if (sd->disabled) return EINA_TRUE; return elm_widget_disabled_get(elm_widget_parent_get(obj)); } EOLIAN static void -_elm_widget_show_region_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Rect sr, Eina_Bool forceshow) +_efl_ui_widget_show_region_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Rect sr, Eina_Bool forceshow) { Evas_Object *parent_obj, *child_obj; Evas_Coord px, py, cx, cy, nx = 0, ny = 0; @@ -2490,7 +2490,7 @@ _elm_widget_show_region_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Rect sr, Ei } EOLIAN static Eina_Rect -_elm_widget_show_region_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) +_efl_ui_widget_show_region_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) { return (Eina_Rect) sd->show_region; } @@ -2514,7 +2514,7 @@ _elm_widget_show_region_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) * @ingroup Widget */ EOLIAN static Eina_Rect -_elm_widget_interest_region_get(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED) +_efl_ui_widget_interest_region_get(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED) { Eina_Rect r = {}; r.size = efl_gfx_size_get(obj); @@ -2522,7 +2522,7 @@ _elm_widget_interest_region_get(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED) } EOLIAN static void -_elm_widget_scroll_hold_push(Eo *obj, Elm_Widget_Smart_Data *sd) +_efl_ui_widget_scroll_hold_push(Eo *obj, Elm_Widget_Smart_Data *sd) { sd->scroll_hold++; if (sd->scroll_hold == 1) @@ -2546,7 +2546,7 @@ _elm_widget_scroll_hold_push(Eo *obj, Elm_Widget_Smart_Data *sd) } EOLIAN static void -_elm_widget_scroll_hold_pop(Eo *obj, Elm_Widget_Smart_Data *sd) +_efl_ui_widget_scroll_hold_pop(Eo *obj, Elm_Widget_Smart_Data *sd) { sd->scroll_hold--; if (!sd->scroll_hold) @@ -2579,7 +2579,7 @@ elm_widget_scroll_hold_get(const Eo *obj) } EOLIAN static void -_elm_widget_scroll_freeze_push(Eo *obj, Elm_Widget_Smart_Data *sd) +_efl_ui_widget_scroll_freeze_push(Eo *obj, Elm_Widget_Smart_Data *sd) { sd->scroll_freeze++; if (sd->scroll_freeze == 1) @@ -2603,7 +2603,7 @@ _elm_widget_scroll_freeze_push(Eo *obj, Elm_Widget_Smart_Data *sd) } EOLIAN static void -_elm_widget_scroll_freeze_pop(Eo *obj, Elm_Widget_Smart_Data *sd) +_efl_ui_widget_scroll_freeze_pop(Eo *obj, Elm_Widget_Smart_Data *sd) { sd->scroll_freeze--; if (!sd->scroll_freeze) @@ -2636,7 +2636,7 @@ elm_widget_scroll_freeze_get(const Eo *obj) } EOLIAN static void -_elm_widget_efl_gfx_scale_set(Eo *obj, Elm_Widget_Smart_Data *sd, double scale) +_efl_ui_widget_efl_gfx_scale_set(Eo *obj, Elm_Widget_Smart_Data *sd, double scale) { if (scale < 0.0) scale = 0.0; if (sd->scale != scale) @@ -2647,7 +2647,7 @@ _elm_widget_efl_gfx_scale_set(Eo *obj, Elm_Widget_Smart_Data *sd, double scale) } EOLIAN static double -_elm_widget_efl_gfx_scale_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) +_efl_ui_widget_efl_gfx_scale_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) { // FIXME: save walking up the tree by storing/caching parent scale if (sd->scale == 0.0) @@ -2841,7 +2841,7 @@ elm_widget_part_translatable_text_get(const Eo *obj, const char *part, const cha } EOLIAN static void -_elm_widget_efl_ui_translatable_translation_update(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) +_efl_ui_widget_efl_ui_translatable_translation_update(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) { const Eina_List *l; Evas_Object *child; @@ -2869,13 +2869,13 @@ _elm_widget_efl_ui_translatable_translation_update(Eo *obj EINA_UNUSED, Elm_Widg } EOLIAN static void -_elm_widget_access_info_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, const char *txt) +_efl_ui_widget_access_info_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, const char *txt) { eina_stringshare_replace(&sd->access_info, txt); } EOLIAN static const char* -_elm_widget_access_info_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) +_efl_ui_widget_access_info_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) { return sd->access_info; } @@ -2895,7 +2895,7 @@ elm_widget_theme_get(const Evas_Object *obj) } EOLIAN static Efl_Ui_Theme_Apply -_elm_widget_style_set(Eo *obj, Elm_Widget_Smart_Data *sd, const char *style) +_efl_ui_widget_style_set(Eo *obj, Elm_Widget_Smart_Data *sd, const char *style) { if (!elm_widget_is_legacy(obj) && efl_finalized_get(obj)) { @@ -2910,7 +2910,7 @@ _elm_widget_style_set(Eo *obj, Elm_Widget_Smart_Data *sd, const char *style) } EOLIAN static const char* -_elm_widget_style_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) +_efl_ui_widget_style_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) { const char *ret; ret = "default"; @@ -3050,7 +3050,7 @@ _convert(Efl_Dbg_Info *info, Eina_Iterator *ptr_list) } EOLIAN static void -_elm_widget_efl_object_dbg_info_get(Eo *eo_obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Efl_Dbg_Info *root) +_efl_ui_widget_efl_object_dbg_info_get(Eo *eo_obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Efl_Dbg_Info *root) { efl_dbg_info_get(efl_super(eo_obj, MY_CLASS), root); Efl_Ui_Focus_Relations *rel = NULL; @@ -3339,7 +3339,7 @@ elm_widget_focus_highlight_focus_part_geometry_get(const Evas_Object *obj, } EOLIAN static Eina_Rect -_elm_widget_focus_highlight_geometry_get(Eo *obj, Elm_Widget_Smart_Data *sd) +_efl_ui_widget_focus_highlight_geometry_get(Eo *obj, Elm_Widget_Smart_Data *sd) { Evas_Coord ox = 0, oy = 0, ow = 0, oh = 0; Evas_Object *scroller = (Evas_Object *)obj; @@ -3375,19 +3375,19 @@ _elm_widget_focus_highlight_geometry_get(Eo *obj, Elm_Widget_Smart_Data *sd) } EOLIAN static Elm_Object_Item* -_elm_widget_focused_item_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED) +_efl_ui_widget_focused_item_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED) { return NULL; } EOLIAN static void -_elm_widget_interest_region_mode_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd, Elm_Focus_Region_Show_Mode mode) +_efl_ui_widget_interest_region_mode_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd, Elm_Focus_Region_Show_Mode mode) { _pd->focus_region_show_mode = mode; } EOLIAN static Elm_Focus_Region_Show_Mode -_elm_widget_interest_region_mode_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd) +_efl_ui_widget_interest_region_mode_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd) { return _pd->focus_region_show_mode; } @@ -3451,7 +3451,7 @@ elm_widget_display_mode_set(Evas_Object *obj, Evas_Display_Mode dispmode) } EOLIAN static void -_elm_widget_orientation_mode_disabled_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool disabled) +_efl_ui_widget_orientation_mode_disabled_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool disabled) { int orient_mode = -1; @@ -3467,14 +3467,14 @@ _elm_widget_orientation_mode_disabled_set(Eo *obj, Elm_Widget_Smart_Data *sd, Ei } EOLIAN static Eina_Bool -_elm_widget_orientation_mode_disabled_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) +_efl_ui_widget_orientation_mode_disabled_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) { if (sd->orient_mode == -1) return EINA_TRUE; else return EINA_FALSE; } EOLIAN static void -_elm_widget_on_orientation_update(Eo *obj, Elm_Widget_Smart_Data *sd, int orient_mode) +_efl_ui_widget_on_orientation_update(Eo *obj, Elm_Widget_Smart_Data *sd, int orient_mode) { Evas_Object *child; Eina_List *l; @@ -3505,7 +3505,7 @@ _elm_widget_on_orientation_update(Eo *obj, Elm_Widget_Smart_Data *sd, int orient * **/ EOLIAN static Elm_Focus_Move_Policy -_elm_widget_focus_move_policy_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) +_efl_ui_widget_focus_move_policy_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) { return sd->focus_move_policy; } @@ -3520,7 +3520,7 @@ _elm_widget_focus_move_policy_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd */ EOLIAN static void -_elm_widget_focus_move_policy_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Elm_Focus_Move_Policy policy) +_efl_ui_widget_focus_move_policy_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Elm_Focus_Move_Policy policy) { if (sd->focus_move_policy == policy) return; sd->focus_move_policy = policy; @@ -3534,7 +3534,7 @@ _elm_widget_focus_move_policy_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd * **/ EOLIAN static Eina_Bool -_elm_widget_focus_move_policy_automatic_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) +_efl_ui_widget_focus_move_policy_automatic_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) { return sd->focus_move_policy_auto_mode; } @@ -3549,7 +3549,7 @@ _elm_widget_focus_move_policy_automatic_get(Eo *obj EINA_UNUSED, Elm_Widget_Smar * @param automatic EINA_TRUE for auto focus_move_policy mode. EINA_FALSE for manual. */ EOLIAN static void -_elm_widget_focus_move_policy_automatic_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool automatic) +_efl_ui_widget_focus_move_policy_automatic_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool automatic) { if (sd->focus_move_policy_auto_mode != automatic) { @@ -3679,7 +3679,7 @@ elm_widget_element_update(Evas_Object *obj, Evas_Object *component, const char * group = eina_stringshare_add(name); else group = eina_stringshare_printf("%s/%s", elm_widget_theme_element_get(obj), name); - if (efl_isa(component, ELM_WIDGET_CLASS)) + if (efl_isa(component, EFL_UI_WIDGET_CLASS)) { changed |= elm_widget_theme_klass_set(component, elm_widget_theme_klass_get(obj)); changed |= elm_widget_theme_element_set(component, (const char *)group); @@ -5152,7 +5152,7 @@ _focus_event_changed(void *data EINA_UNUSED, const Efl_Event *event) } EOLIAN static Eo * -_elm_widget_efl_object_constructor(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED) +_efl_ui_widget_efl_object_constructor(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED) { Eo *parent = NULL; @@ -5178,7 +5178,7 @@ _elm_widget_efl_object_constructor(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSE } EOLIAN static Efl_Object* -_elm_widget_efl_object_finalize(Eo *obj, Elm_Widget_Smart_Data *pd) +_efl_ui_widget_efl_object_finalize(Eo *obj, Elm_Widget_Smart_Data *pd) { Eo *eo; @@ -5191,7 +5191,7 @@ _elm_widget_efl_object_finalize(Eo *obj, Elm_Widget_Smart_Data *pd) EOLIAN static void -_elm_widget_efl_object_destructor(Eo *obj, Elm_Widget_Smart_Data *sd) +_efl_ui_widget_efl_object_destructor(Eo *obj, Elm_Widget_Smart_Data *sd) { if (sd->manager.provider) { @@ -5207,13 +5207,13 @@ _elm_widget_efl_object_destructor(Eo *obj, Elm_Widget_Smart_Data *sd) } sd->on_destroy = EINA_TRUE; - efl_destructor(efl_super(obj, ELM_WIDGET_CLASS)); + efl_destructor(efl_super(obj, EFL_UI_WIDGET_CLASS)); sd->on_destroy = EINA_FALSE; } /* internal eo */ static void -_elm_widget_legacy_ctor(Eo *obj, Elm_Widget_Smart_Data *sd) +_efl_ui_widget_legacy_ctor(Eo *obj, Elm_Widget_Smart_Data *sd) { efl_canvas_object_legacy_ctor(efl_super(obj, MY_CLASS)); sd->legacy = EINA_TRUE; @@ -5221,7 +5221,7 @@ _elm_widget_legacy_ctor(Eo *obj, Elm_Widget_Smart_Data *sd) } EOLIAN static void -_elm_widget_efl_object_debug_name_override(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED, Eina_Strbuf *sb) +_efl_ui_widget_efl_object_debug_name_override(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED, Eina_Strbuf *sb) { const char *focus = ""; @@ -5231,7 +5231,7 @@ _elm_widget_efl_object_debug_name_override(Eo *obj, Elm_Widget_Smart_Data *sd EI } EOLIAN static Eina_Bool -_elm_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, Elm_Object_Item *item EINA_UNUSED) { Eina_Bool focused; @@ -5250,19 +5250,19 @@ _elm_widget_on_focus_update(Eo *obj, Elm_Widget_Smart_Data *sd, Elm_Object_Item } EOLIAN static Eina_Bool -_elm_widget_on_disabled_update(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Eina_Bool disabled EINA_UNUSED) +_efl_ui_widget_on_disabled_update(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Eina_Bool disabled EINA_UNUSED) { return EINA_FALSE; } EOLIAN static Eina_Bool -_elm_widget_widget_event(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED, const Efl_Event *eo_event EINA_UNUSED, Evas_Object *source EINA_UNUSED) +_efl_ui_widget_widget_event(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED, const Efl_Event *eo_event EINA_UNUSED, Evas_Object *source EINA_UNUSED) { return EINA_FALSE; } EOLIAN static Eina_Bool -_elm_widget_on_access_activate(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Efl_Ui_Activate act EINA_UNUSED) +_efl_ui_widget_on_access_activate(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Efl_Ui_Activate act EINA_UNUSED) { WRN("The %s widget does not implement the \"activate\" functions.", efl_class_name_get(efl_class_get(obj))); @@ -5270,13 +5270,13 @@ _elm_widget_on_access_activate(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd E } EOLIAN static void -_elm_widget_class_constructor(Efl_Class *klass) +_efl_ui_widget_class_constructor(Efl_Class *klass) { evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); } EOLIAN static Eina_Bool -_elm_widget_efl_access_component_focus_grab(Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED) +_efl_ui_widget_efl_access_component_focus_grab(Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED) { if (elm_object_focus_allow_get(obj)) { @@ -5290,10 +5290,10 @@ _elm_widget_efl_access_component_focus_grab(Eo *obj, Elm_Widget_Smart_Data *pd E } EOLIAN static const char* -_elm_widget_efl_access_name_get(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED) +_efl_ui_widget_efl_access_name_get(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED) { const char *ret, *name; - name = efl_access_name_get(efl_super(obj, ELM_WIDGET_CLASS)); + name = efl_access_name_get(efl_super(obj, EFL_UI_WIDGET_CLASS)); if (name) return name; @@ -5304,7 +5304,7 @@ _elm_widget_efl_access_name_get(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED) } EOLIAN static Eina_List* -_elm_widget_efl_access_children_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd) +_efl_ui_widget_efl_access_children_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd) { Eina_List *l, *accs = NULL; Evas_Object *widget; @@ -5329,7 +5329,7 @@ _elm_widget_efl_access_children_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data * } EOLIAN static Eo* -_elm_widget_efl_access_parent_get(Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED) +_efl_ui_widget_efl_access_parent_get(Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED) { Efl_Access_Type type; Efl_Access *parent = obj; @@ -5344,11 +5344,11 @@ _elm_widget_efl_access_parent_get(Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED } EOLIAN static Efl_Access_State_Set -_elm_widget_efl_access_state_set_get(Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED) +_efl_ui_widget_efl_access_state_set_get(Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED) { Efl_Access_State_Set states = 0; - states = efl_access_state_set_get(efl_super(obj, ELM_WIDGET_CLASS)); + states = efl_access_state_set_get(efl_super(obj, EFL_UI_WIDGET_CLASS)); if (evas_object_visible_get(obj)) { @@ -5373,11 +5373,11 @@ _elm_widget_efl_access_state_set_get(Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNU } EOLIAN static Eina_List* -_elm_widget_efl_access_attributes_get(Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED) +_efl_ui_widget_efl_access_attributes_get(Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED) { Eina_List *attr_list = NULL; - attr_list = efl_access_attributes_get(efl_super(obj, ELM_WIDGET_CLASS)); + attr_list = efl_access_attributes_get(efl_super(obj, EFL_UI_WIDGET_CLASS)); //Add type and style information in addition. Efl_Access_Attribute *attr = NULL; @@ -5470,7 +5470,7 @@ _elm_widget_item_efl_access_component_alpha_get(Eo *obj EINA_UNUSED, Elm_Widget_ } EOLIAN static Efl_Object * -_elm_widget_efl_object_provider_find(const Eo *obj, Elm_Widget_Smart_Data *pd, const Efl_Object *klass) +_efl_ui_widget_efl_object_provider_find(const Eo *obj, Elm_Widget_Smart_Data *pd, const Efl_Object *klass) { Efl_Object *lookup = NULL; @@ -5489,25 +5489,25 @@ _elm_widget_efl_object_provider_find(const Eo *obj, Elm_Widget_Smart_Data *pd, c } EOLIAN static Efl_Ui_Focus_Manager* -_elm_widget_efl_ui_focus_user_focus_parent_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd EINA_UNUSED) +_efl_ui_widget_efl_ui_focus_user_focus_parent_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd EINA_UNUSED) { return pd->focus.parent; } EOLIAN static Efl_Ui_Focus_Manager* -_elm_widget_efl_ui_focus_user_focus_manager_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd EINA_UNUSED) +_efl_ui_widget_efl_ui_focus_user_focus_manager_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd EINA_UNUSED) { return pd->focus.manager; } EOLIAN static Eina_Rect -_elm_widget_efl_ui_focus_object_focus_geometry_get(Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED) +_efl_ui_widget_efl_ui_focus_object_focus_geometry_get(Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED) { return efl_gfx_geometry_get(obj); } EOLIAN static void -_elm_widget_efl_ui_focus_object_focus_set(Eo *obj, Elm_Widget_Smart_Data *pd, Eina_Bool focus) +_efl_ui_widget_efl_ui_focus_object_focus_set(Eo *obj, Elm_Widget_Smart_Data *pd, Eina_Bool focus) { pd->focused = focus; @@ -5517,7 +5517,7 @@ _elm_widget_efl_ui_focus_object_focus_set(Eo *obj, Elm_Widget_Smart_Data *pd, Ei } EOLIAN static Efl_Ui_Focus_Manager* -_elm_widget_focus_manager_create(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd EINA_UNUSED, Efl_Ui_Focus_Object *root EINA_UNUSED) +_efl_ui_widget_focus_manager_create(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd EINA_UNUSED, Efl_Ui_Focus_Object *root EINA_UNUSED) { ERR("No manager presented"); return NULL; @@ -5541,7 +5541,7 @@ elm_widget_content_part_set(Evas_Object *obj, const char *part, Evas_Object *con if (!efl_isa(obj, EFL_PART_INTERFACE)) return; if (!part) { - part = elm_widget_default_content_part_get(obj); + part = efl_ui_widget_default_content_part_get(obj); if (!part) return; } efl_content_set(efl_part(obj, part), content); @@ -5556,7 +5556,7 @@ elm_widget_content_part_get(const Evas_Object *obj, const char *part) if (!efl_isa(obj, EFL_PART_INTERFACE)) return NULL; if (!part) { - part = elm_widget_default_content_part_get(obj); + part = efl_ui_widget_default_content_part_get(obj); if (!part) return NULL; } return efl_content_get(efl_part(obj, part)); @@ -5571,7 +5571,7 @@ elm_widget_content_part_unset(Evas_Object *obj, const char *part) if (!efl_isa(obj, EFL_PART_INTERFACE)) return NULL; if (!part) { - part = elm_widget_default_content_part_get(obj); + part = efl_ui_widget_default_content_part_get(obj); if (!part) return NULL; } return efl_content_unset(efl_part(obj, part)); @@ -5739,7 +5739,7 @@ _widget_shadow_update(Widget_Shadow *ws) } static void -_elm_widget_shadow_update(Elm_Widget *obj) +_elm_widget_shadow_update(Efl_Ui_Widget *obj) { Widget_Shadow *shadow = _widget_shadow_part_get(obj); _widget_shadow_update(shadow); @@ -5890,7 +5890,7 @@ _efl_ui_widget_part_shadow_efl_gfx_filter_filter_state_get(Eo *obj, void *_pd EI /* Efl.Part implementation */ EOLIAN static Efl_Object * -_elm_widget_efl_part_part(const Eo *obj, Elm_Widget_Smart_Data *wd EINA_UNUSED, const char *part) +_efl_ui_widget_efl_part_part(const Eo *obj, Elm_Widget_Smart_Data *wd EINA_UNUSED, const char *part) { if (eina_streq(part, "background")) return ELM_PART_IMPLEMENT(EFL_UI_WIDGET_PART_BG_CLASS, obj, part); @@ -5914,7 +5914,7 @@ _efl_ui_widget_part_efl_object_destructor(Eo *obj, Elm_Part_Data *pd) /* Efl.Part Bg implementation */ Efl_Canvas_Object * -_efl_ui_widget_bg_get(Elm_Widget *obj) +_efl_ui_widget_bg_get(Efl_Ui_Widget *obj) { Elm_Widget_Smart_Data *sd = efl_data_scope_get(obj, MY_CLASS); Evas_Object *bg_obj = sd->bg; @@ -5994,21 +5994,21 @@ _efl_ui_widget_part_bg_efl_image_scale_type_get(Eo *obj, void *pd EINA_UNUSED) /* Internal EO APIs and hidden overrides */ -EFL_FUNC_BODY_CONST(elm_widget_default_content_part_get, const char *, NULL) -EFL_FUNC_BODY_CONST(elm_widget_default_text_part_get, const char *, NULL) +EFL_FUNC_BODY_CONST(efl_ui_widget_default_content_part_get, const char *, NULL) +EFL_FUNC_BODY_CONST(efl_ui_widget_default_text_part_get, const char *, NULL) -ELM_PART_CONTENT_DEFAULT_GET(elm_widget, NULL) -ELM_PART_TEXT_DEFAULT_GET(elm_widget, NULL) +ELM_PART_CONTENT_DEFAULT_GET(efl_ui_widget, NULL) +ELM_PART_TEXT_DEFAULT_GET(efl_ui_widget, NULL) -#define ELM_WIDGET_EXTRA_OPS \ - EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_widget), \ - ELM_PART_CONTENT_DEFAULT_OPS(elm_widget), \ - ELM_PART_TEXT_DEFAULT_OPS(elm_widget), \ - EFL_OBJECT_OP_FUNC(efl_canvas_object_legacy_ctor, _elm_widget_legacy_ctor), \ - EFL_OBJECT_OP_FUNC(efl_dbg_info_get, _elm_widget_efl_object_dbg_info_get) +#define EFL_UI_WIDGET_EXTRA_OPS \ + EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_widget), \ + ELM_PART_CONTENT_DEFAULT_OPS(efl_ui_widget), \ + ELM_PART_TEXT_DEFAULT_OPS(efl_ui_widget), \ + EFL_OBJECT_OP_FUNC(efl_canvas_object_legacy_ctor, _efl_ui_widget_legacy_ctor), \ + EFL_OBJECT_OP_FUNC(efl_dbg_info_get, _efl_ui_widget_efl_object_dbg_info_get) #include "elm_widget_item.eo.c" -#include "elm_widget.eo.c" +#include "efl_ui_widget.eo.c" /* Others */ #include "efl_ui_translatable.eo.c" diff --git a/src/lib/elementary/elm_widget.eo b/src/lib/elementary/efl_ui_widget.eo index a3bf4f1ca6..f4933d4438 100644 --- a/src/lib/elementary/elm_widget.eo +++ b/src/lib/elementary/efl_ui_widget.eo @@ -14,14 +14,14 @@ struct Efl.Ui.Widget.Focus_State { } /* ATTENTION: Rename to Efl.Ui.Widget is imminent. */ -abstract Elm.Widget (Efl.Canvas.Group, Efl.Access, - Efl.Access.Component, Efl.Ui.Focus.User, Efl.Part, - Efl.Ui.Focus.Object, Efl.Ui.Base, Efl.Ui.Cursor, - Efl.Ui.Translatable) +abstract Efl.Ui.Widget (Efl.Canvas.Group, Efl.Access, + Efl.Access.Component, Efl.Ui.Focus.User, Efl.Part, + Efl.Ui.Focus.Object, Efl.Ui.Base, Efl.Ui.Cursor, + Efl.Ui.Translatable) { [[Elementary widget abstract class]] legacy_prefix: elm_widget; - eo_prefix: efl_ui_widget; + //eo_prefix: efl_ui_widget; event_prefix: efl_ui_widget; data: Efl_Ui_Widget_Data; methods { @@ -158,7 +158,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Efl.Access, @property widget_parent @protected { [[The internal parent of this widget. - @Elm.Widget objects have a parent hierarchy that may differ slightly + @Efl.Ui.Widget objects have a parent hierarchy that may differ slightly from their @Efl.Object or @Efl.Canvas.Object hierarchy. This is meant for internal handling. @@ -169,7 +169,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Efl.Access, legacy: elm_widget_parent_get; /* internal in legacy */ } values { - parent: Elm.Widget @nullable; [[Widget parent object]] + parent: Efl.Ui.Widget @nullable; [[Widget parent object]] } } @property widget_top { @@ -194,7 +194,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Efl.Access, legacy: elm_widget_top_get; /* internal in legacy */ } values { - top: Elm.Widget; [[Top widget, usually a window.]] + top: Efl.Ui.Widget; [[Top widget, usually a window.]] } } @@ -553,7 +553,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Efl.Access, [[The focus manager to register with.]] @inout configured_state : Efl.Ui.Widget.Focus_State; [[The evalulated Focus state that should be used.]] - @in redirect : Elm.Widget; + @in redirect : Efl.Ui.Widget; [[A redirect that will be set by the elm.widget implementation.]] } return: bool; [[Returns whether the widget is registered or not.]] diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c index 710285a559..d78994423c 100644 --- a/src/lib/elementary/efl_ui_win.c +++ b/src/lib/elementary/efl_ui_win.c @@ -1666,7 +1666,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) +_efl_ui_win_efl_ui_widget_on_focus_update(Eo *obj, Efl_Ui_Win_Data *sd, Elm_Object_Item *item EINA_UNUSED) { if (!efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL)) return EINA_TRUE; @@ -5472,7 +5472,7 @@ _efl_ui_win_efl_canvas_object_legacy_ctor(Eo *obj, Efl_Ui_Win_Data *sd) } EOLIAN static Efl_Ui_Focus_Manager* -_efl_ui_win_elm_widget_focus_manager_create(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *pd EINA_UNUSED, Efl_Ui_Focus_Object *root) +_efl_ui_win_efl_ui_widget_focus_manager_create(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *pd EINA_UNUSED, Efl_Ui_Focus_Object *root) { Efl_Ui_Focus_Manager *manager; @@ -6595,7 +6595,7 @@ _efl_ui_win_keygrab_unset(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, const char * } EOLIAN static void -_efl_ui_win_elm_widget_focus_highlight_enabled_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, Eina_Bool enabled) +_efl_ui_win_efl_ui_widget_focus_highlight_enabled_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, Eina_Bool enabled) { // Do not call efl_super() here. Only Win handles this property. enabled = !!enabled; @@ -6611,7 +6611,7 @@ _efl_ui_win_elm_widget_focus_highlight_enabled_set(Eo *obj EINA_UNUSED, Efl_Ui_W } EOLIAN static Eina_Bool -_efl_ui_win_elm_widget_focus_highlight_enabled_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd) +_efl_ui_win_efl_ui_widget_focus_highlight_enabled_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd) { // Do not call efl_super() here. Only Win handles this property. return sd->focus_highlight.enabled; @@ -6647,7 +6647,7 @@ _elm_win_theme_internal(Eo *obj, Efl_Ui_Win_Data *sd) } EOLIAN static Efl_Ui_Theme_Apply -_efl_ui_win_elm_widget_theme_apply(Eo *obj, Efl_Ui_Win_Data *sd) +_efl_ui_win_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Win_Data *sd) { Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); @@ -6663,7 +6663,7 @@ _efl_ui_win_elm_widget_theme_apply(Eo *obj, Efl_Ui_Win_Data *sd) } EOLIAN static Eina_Bool -_efl_ui_win_elm_widget_focus_highlight_style_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, const char *style) +_efl_ui_win_efl_ui_widget_focus_highlight_style_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, const char *style) { // Do not call efl_super() here. Only Win handles this property. if (!eina_stringshare_replace(&sd->focus_highlight.style, style)) @@ -6675,14 +6675,14 @@ _efl_ui_win_elm_widget_focus_highlight_style_set(Eo *obj EINA_UNUSED, Efl_Ui_Win } EOLIAN static const char* -_efl_ui_win_elm_widget_focus_highlight_style_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd) +_efl_ui_win_efl_ui_widget_focus_highlight_style_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd) { // Do not call efl_super() here. Only Win handles this property. return sd->focus_highlight.style; } EOLIAN static void -_efl_ui_win_elm_widget_focus_highlight_animate_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, Eina_Bool animate) +_efl_ui_win_efl_ui_widget_focus_highlight_animate_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, Eina_Bool animate) { // Do not call efl_super() here. Only Win handles this property. animate = !!animate; @@ -6695,7 +6695,7 @@ _efl_ui_win_elm_widget_focus_highlight_animate_set(Eo *obj EINA_UNUSED, Efl_Ui_W } EOLIAN static Eina_Bool -_efl_ui_win_elm_widget_focus_highlight_animate_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd) +_efl_ui_win_efl_ui_widget_focus_highlight_animate_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd) { // Do not call efl_super() here. Only Win handles this property. return sd->focus_highlight.animate; @@ -7124,7 +7124,7 @@ _elm_win_bg_must_swallow(Efl_Ui_Win_Data *sd) sd->legacy.bg_must_swallow_init = 1; bg = elm_bg_add(sd->obj); - wd = efl_data_scope_get(bg, ELM_WIDGET_CLASS); + wd = efl_data_scope_get(bg, EFL_UI_WIDGET_CLASS); if (wd) { version = edje_object_data_get(wd->resize_obj, "version"); diff --git a/src/lib/elementary/efl_ui_win.eo b/src/lib/elementary/efl_ui_win.eo index ed23a44aee..85be4f2708 100644 --- a/src/lib/elementary/efl_ui_win.eo +++ b/src/lib/elementary/efl_ui_win.eo @@ -157,11 +157,11 @@ enum Efl.Ui.Win.Move_Resize_Mode right = (1 << 4) [[Start resizing window to the right]] } -class Efl.Ui.Win (Elm.Widget, Efl.Canvas, Efl.Canvas.Pointer, Efl.Access.Window, - Efl.Access.Component, Efl.Access.Widget.Action, - Efl.Content, Efl.Input.State, Efl.Input.Interface, Efl.Screen, - Efl.Gfx.Size.Hint, Efl.Text, Efl.Config.Global, Efl.Part, - Efl.Ui.Focus.Manager ) +class Efl.Ui.Win (Efl.Ui.Widget, Efl.Canvas, Efl.Canvas.Pointer, Efl.Access.Window, + Efl.Access.Component, Efl.Access.Widget.Action, + Efl.Content, Efl.Input.State, Efl.Input.Interface, Efl.Screen, + Efl.Gfx.Size.Hint, Efl.Text, Efl.Config.Global, Efl.Part, + Efl.Ui.Focus.Manager ) { [[Efl UI window class]] legacy_prefix: elm_win; @@ -784,14 +784,14 @@ class Efl.Ui.Win (Elm.Widget, Efl.Canvas, Efl.Canvas.Pointer, Efl.Access.Window, Efl.Gfx.Stack.raise; [[Places the window at the top of the stack, so that it's not covered by any other window.]] Efl.Gfx.Stack.lower; [[This action is ignored by the Window.]] - Elm.Widget.theme_apply; + Efl.Ui.Widget.theme_apply; Efl.Ui.Focus.Object.focus { get; } - Elm.Widget.focus_highlight_style { get; set; } - Elm.Widget.focus_highlight_enabled { get; set; } - Elm.Widget.focus_highlight_animate { get; set; } - Elm.Widget.on_focus_update; - Elm.Widget.widget_event; - Elm.Widget.focus_manager_create; + 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.Widget.widget_event; + Efl.Ui.Widget.focus_manager_create; Efl.Access.parent { get; } Efl.Access.state_set { get; } Efl.Access.name { get; } diff --git a/src/lib/elementary/elc_combobox.c b/src/lib/elementary/elc_combobox.c index aa426b1e0d..03696a3a89 100644 --- a/src/lib/elementary/elc_combobox.c +++ b/src/lib/elementary/elc_combobox.c @@ -61,7 +61,7 @@ _elm_combobox_efl_ui_translatable_translation_update(Eo *obj EINA_UNUSED, Elm_Co } EOLIAN static Efl_Ui_Theme_Apply -_elm_combobox_elm_widget_theme_apply(Eo *obj, Elm_Combobox_Data *sd) +_elm_combobox_efl_ui_widget_theme_apply(Eo *obj, Elm_Combobox_Data *sd) { const char *style; Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; diff --git a/src/lib/elementary/elc_ctxpopup.c b/src/lib/elementary/elc_ctxpopup.c index 84543812e1..5fc6ba39c4 100644 --- a/src/lib/elementary/elc_ctxpopup.c +++ b/src/lib/elementary/elc_ctxpopup.c @@ -4,7 +4,8 @@ #define EFL_ACCESS_PROTECTED #define EFL_ACCESS_WIDGET_ACTION_PROTECTED -#define ELM_WIDGET_PROTECTED +#define EFL_UI_WIDGET_PROTECTED +//#define EFL_UI_WIDGET_BETA #define ELM_WIDGET_ITEM_PROTECTED #define EFL_UI_TRANSLATABLE_PROTECTED @@ -522,12 +523,12 @@ _base_shift_by_arrow(Evas_Object *arrow, } EOLIAN static Eina_Bool -_elm_ctxpopup_elm_widget_widget_sub_object_add(Eo *obj, Elm_Ctxpopup_Data *_pd EINA_UNUSED, Evas_Object *sobj) +_elm_ctxpopup_efl_ui_widget_widget_sub_object_add(Eo *obj, Elm_Ctxpopup_Data *_pd EINA_UNUSED, Evas_Object *sobj) { /* Skipping elm_layout widget_sub_object_add in order to ignore size hint changes. * Note: It is not clear WHY we are doing this. Same reason as genlist? */ - return elm_widget_sub_object_add(efl_cast(obj, ELM_WIDGET_CLASS), sobj); + return elm_widget_sub_object_add(efl_cast(obj, EFL_UI_WIDGET_CLASS), sobj); } EOLIAN static void @@ -667,7 +668,7 @@ _on_content_resized(void *data, //FIXME: lost the content size when theme hook is called. EOLIAN static Efl_Ui_Theme_Apply -_elm_ctxpopup_elm_widget_theme_apply(Eo *obj, Elm_Ctxpopup_Data *sd) +_elm_ctxpopup_efl_ui_widget_theme_apply(Eo *obj, Elm_Ctxpopup_Data *sd) { Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; @@ -1031,7 +1032,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) +_elm_ctxpopup_efl_ui_widget_on_disabled_update(Eo *obj, Elm_Ctxpopup_Data *sd, Eina_Bool disabled) { if (!efl_ui_widget_on_disabled_update(efl_super(obj, MY_CLASS), disabled)) return EINA_FALSE; @@ -1118,7 +1119,7 @@ _elm_ctxpopup_efl_canvas_group_group_del(Eo *obj, Elm_Ctxpopup_Data *sd) } EOLIAN static void -_elm_ctxpopup_elm_widget_widget_parent_set(Eo *obj, Elm_Ctxpopup_Data *_pd EINA_UNUSED, Evas_Object *parent) +_elm_ctxpopup_efl_ui_widget_widget_parent_set(Eo *obj, Elm_Ctxpopup_Data *_pd EINA_UNUSED, Evas_Object *parent) { //default parent is to be hover parent elm_ctxpopup_hover_parent_set(obj, parent); @@ -1445,7 +1446,7 @@ _elm_ctxpopup_efl_ui_menu_selected_item_get(Eo *obj EINA_UNUSED, Elm_Ctxpopup_Da } EOLIAN static Elm_Object_Item* -_elm_ctxpopup_elm_widget_focused_item_get(Eo *obj EINA_UNUSED, Elm_Ctxpopup_Data *sd) +_elm_ctxpopup_efl_ui_widget_focused_item_get(Eo *obj EINA_UNUSED, Elm_Ctxpopup_Data *sd) { if (!sd->list) return NULL; diff --git a/src/lib/elementary/elc_fileselector.c b/src/lib/elementary/elc_fileselector.c index bfb1c8503c..dddd47ccf5 100644 --- a/src/lib/elementary/elc_fileselector.c +++ b/src/lib/elementary/elc_fileselector.c @@ -232,7 +232,7 @@ _model_str_property_set(Efl_Model *model, const char *property_name, const char } EOLIAN static Efl_Ui_Theme_Apply -_elm_fileselector_elm_widget_theme_apply(Eo *obj, Elm_Fileselector_Data *sd) +_elm_fileselector_efl_ui_widget_theme_apply(Eo *obj, Elm_Fileselector_Data *sd) { const char *style; const char *data; @@ -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, Efl_Ui_Widget_Focus_State current_state, Efl_Ui_Widget_Focus_State *configured_state, Elm_Widget *redirect) +_elm_fileselector_efl_ui_widget_focus_state_apply(Eo *obj, Elm_Fileselector_Data *pd, Efl_Ui_Widget_Focus_State current_state, Efl_Ui_Widget_Focus_State *configured_state, Efl_Ui_Widget *redirect) { Eina_Bool ret = efl_ui_widget_focus_state_apply(efl_super(obj, MY_CLASS), current_state, configured_state, redirect); diff --git a/src/lib/elementary/elc_fileselector_button.c b/src/lib/elementary/elc_fileselector_button.c index 52b7789e16..3bb473463e 100644 --- a/src/lib/elementary/elc_fileselector_button.c +++ b/src/lib/elementary/elc_fileselector_button.c @@ -44,7 +44,7 @@ _model_free_eo_cb(void *eo) } EOLIAN static Efl_Ui_Theme_Apply -_elm_fileselector_button_elm_widget_theme_apply(Eo *obj, Elm_Fileselector_Button_Data *sd EINA_UNUSED) +_elm_fileselector_button_efl_ui_widget_theme_apply(Eo *obj, Elm_Fileselector_Button_Data *sd EINA_UNUSED) { Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; diff --git a/src/lib/elementary/elc_fileselector_entry.c b/src/lib/elementary/elc_fileselector_entry.c index 8b0c4238b0..2dcfcec9ab 100644 --- a/src/lib/elementary/elc_fileselector_entry.c +++ b/src/lib/elementary/elc_fileselector_entry.c @@ -160,7 +160,7 @@ _elm_fileselector_entry_elm_layout_sizing_eval(Eo *obj, Elm_Fileselector_Entry_D } EOLIAN static Efl_Ui_Theme_Apply -_elm_fileselector_entry_elm_widget_theme_apply(Eo *obj, Elm_Fileselector_Entry_Data *sd) +_elm_fileselector_entry_efl_ui_widget_theme_apply(Eo *obj, Elm_Fileselector_Entry_Data *sd) { const char *style; char buf[1024]; @@ -191,7 +191,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) +_elm_fileselector_entry_efl_ui_widget_on_disabled_update(Eo *obj, Elm_Fileselector_Entry_Data *sd, Eina_Bool disabled) { if (!efl_ui_widget_on_disabled_update(efl_super(obj, MY_CLASS), disabled)) return EINA_FALSE; diff --git a/src/lib/elementary/elc_hoversel.c b/src/lib/elementary/elc_hoversel.c index 960458f70b..2170c2110e 100644 --- a/src/lib/elementary/elc_hoversel.c +++ b/src/lib/elementary/elc_hoversel.c @@ -62,7 +62,7 @@ _elm_hoversel_efl_ui_translatable_translation_update(Eo *obj EINA_UNUSED, Elm_Ho } EOLIAN static Efl_Ui_Theme_Apply -_elm_hoversel_elm_widget_theme_apply(Eo *obj, Elm_Hoversel_Data *sd) +_elm_hoversel_efl_ui_widget_theme_apply(Eo *obj, Elm_Hoversel_Data *sd) { Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; Eina_List *l; @@ -669,7 +669,7 @@ _elm_hoversel_efl_gfx_visible_set(Eo *obj, Elm_Hoversel_Data *sd, Eina_Bool vis) } EOLIAN static void -_elm_hoversel_elm_widget_widget_parent_set(Eo *obj, Elm_Hoversel_Data *_pd EINA_UNUSED, Evas_Object *parent) +_elm_hoversel_efl_ui_widget_widget_parent_set(Eo *obj, Elm_Hoversel_Data *_pd EINA_UNUSED, Evas_Object *parent) { elm_hoversel_hover_parent_set(obj, parent); } @@ -1000,12 +1000,12 @@ _key_action_escape(Evas_Object *obj, const char *params EINA_UNUSED) 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) +_elm_hoversel_efl_ui_widget_widget_event(Eo *obj, Elm_Hoversel_Data *sd, const Efl_Event *eo_event, Evas_Object *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); + return _hoversel_efl_ui_widget_widget_event(obj, sd, eo_event, src); } static void diff --git a/src/lib/elementary/elc_naviframe.c b/src/lib/elementary/elc_naviframe.c index 256ff2c4fc..0e1e85e190 100644 --- a/src/lib/elementary/elc_naviframe.c +++ b/src/lib/elementary/elc_naviframe.c @@ -60,7 +60,7 @@ static const Elm_Action key_actions[] = { }; EOLIAN static void -_elm_naviframe_elm_widget_resize_object_set(Eo *obj, Elm_Naviframe_Data *pd EINA_UNUSED, +_elm_naviframe_efl_ui_widget_resize_object_set(Eo *obj, Elm_Naviframe_Data *pd EINA_UNUSED, Efl_Canvas_Object *sobj) { if (!sobj || !efl_finalized_get(obj)) goto super; @@ -392,7 +392,7 @@ _item_title_enabled_update(Elm_Naviframe_Item_Data *nit, Eina_Bool transition) } EOLIAN static Efl_Ui_Theme_Apply -_elm_naviframe_elm_widget_theme_apply(Eo *obj, Elm_Naviframe_Data *sd) +_elm_naviframe_efl_ui_widget_theme_apply(Eo *obj, Elm_Naviframe_Data *sd) { Elm_Naviframe_Item_Data *it; const char *style = NULL, *sstyle = NULL; @@ -1507,7 +1507,7 @@ _key_action_item_pop(Evas_Object *obj, const char *params EINA_UNUSED) } EOLIAN static void -_elm_naviframe_elm_widget_on_access_update(Eo *obj EINA_UNUSED, Elm_Naviframe_Data *sd, Eina_Bool is_access) +_elm_naviframe_efl_ui_widget_on_access_update(Eo *obj EINA_UNUSED, Elm_Naviframe_Data *sd, Eina_Bool is_access) { Elm_Naviframe_Item_Data *it; diff --git a/src/lib/elementary/elc_player.c b/src/lib/elementary/elc_player.c index 27cd4f4bd2..368b8aca07 100644 --- a/src/lib/elementary/elc_player.c +++ b/src/lib/elementary/elc_player.c @@ -185,7 +185,7 @@ _update_theme_slider(Evas_Object *obj, Evas_Object *sl, const char *name, const } EOLIAN static Efl_Ui_Theme_Apply -_elm_player_elm_widget_theme_apply(Eo *obj, Elm_Player_Data *sd) +_elm_player_efl_ui_widget_theme_apply(Eo *obj, Elm_Player_Data *sd) { Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c index cc10c9da0b..598f9710e2 100644 --- a/src/lib/elementary/elc_popup.c +++ b/src/lib/elementary/elc_popup.c @@ -351,7 +351,7 @@ _populate_theme_scroll(Elm_Popup_Data *sd) } EOLIAN static Efl_Ui_Theme_Apply -_elm_popup_elm_widget_theme_apply(Eo *obj, Elm_Popup_Data *sd) +_elm_popup_efl_ui_widget_theme_apply(Eo *obj, Elm_Popup_Data *sd) { Elm_Popup_Item_Data *it; Eina_List *elist; @@ -506,7 +506,7 @@ _elm_popup_efl_layout_signal_signal_emit(Eo *obj EINA_UNUSED, Elm_Popup_Data *sd } EOLIAN static Eina_Bool -_elm_popup_elm_widget_widget_sub_object_del(Eo *obj, Elm_Popup_Data *sd, Evas_Object *sobj) +_elm_popup_efl_ui_widget_widget_sub_object_del(Eo *obj, Elm_Popup_Data *sd, Evas_Object *sobj) { Elm_Popup_Item_Data *it; Eina_Bool int_ret = EINA_FALSE; @@ -1484,7 +1484,7 @@ _parent_geom_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_i } EOLIAN static void -_elm_popup_elm_widget_widget_parent_set(Eo *obj, Elm_Popup_Data *sd, Evas_Object *parent) +_elm_popup_efl_ui_widget_widget_parent_set(Eo *obj, Elm_Popup_Data *sd, Evas_Object *parent) { Evas_Coord x, y, w, h; evas_object_geometry_get(parent, &x, &y, &w, &h); @@ -1503,7 +1503,7 @@ _elm_popup_elm_widget_widget_parent_set(Eo *obj, Elm_Popup_Data *sd, Evas_Object } EOLIAN static void -_elm_popup_elm_widget_on_access_update(Eo *obj, Elm_Popup_Data *_pd EINA_UNUSED, Eina_Bool is_access) +_elm_popup_efl_ui_widget_on_access_update(Eo *obj, Elm_Popup_Data *_pd EINA_UNUSED, Eina_Bool is_access) { _access_obj_process(obj, is_access); } diff --git a/src/lib/elementary/elementary_config.h b/src/lib/elementary/elementary_config.h index 38302542fa..9e066041bf 100644 --- a/src/lib/elementary/elementary_config.h +++ b/src/lib/elementary/elementary_config.h @@ -10,8 +10,8 @@ #define ELM_CONFIG_ICON_THEME_ELEMENTARY "_Elementary_Icon_Theme" #if defined(ELEMENTARY_BUILD) || defined(ELM_INTERNAL_API_ARGESFSDFEFC) -#define ELM_WIDGET_PROTECTED -#define ELM_WIDGET_BETA +#define EFL_UI_WIDGET_PROTECTED +#define EFL_UI_WIDGET_BETA #define EFL_CANVAS_OBJECT_PROTECTED #define EFL_CANVAS_GROUP_PROTECTED #define EFL_CANVAS_GROUP_BETA diff --git a/src/lib/elementary/elm_access.c b/src/lib/elementary/elm_access.c index 5cf518f1a3..0c69b0b6bd 100644 --- a/src/lib/elementary/elm_access.c +++ b/src/lib/elementary/elm_access.c @@ -84,7 +84,7 @@ _access_action_callback_call(Evas_Object *obj, } EOLIAN static Eina_Bool -_elm_access_elm_widget_on_access_activate(Eo *obj, void *_pd EINA_UNUSED, Efl_Ui_Activate act) +_elm_access_efl_ui_widget_on_access_activate(Eo *obj, void *_pd EINA_UNUSED, Efl_Ui_Activate act) { int type = ELM_ACCESS_ACTION_FIRST; @@ -145,7 +145,7 @@ _elm_access_elm_widget_on_access_activate(Eo *obj, void *_pd EINA_UNUSED, Efl_Ui } EOLIAN static Eina_Bool -_elm_access_elm_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, Elm_Object_Item *item EINA_UNUSED) { evas_object_focus_set(obj, efl_ui_focus_object_focus_get(obj)); diff --git a/src/lib/elementary/elm_access.eo b/src/lib/elementary/elm_access.eo index 10cb87d46c..b730f4af8a 100644 --- a/src/lib/elementary/elm_access.eo +++ b/src/lib/elementary/elm_access.eo @@ -1,4 +1,4 @@ -class Elm.Access (Elm.Widget, Efl.Access.Widget.Action) +class Elm.Access (Efl.Ui.Widget, Efl.Access.Widget.Action) { [[Elm abstract accessibility class]] legacy_prefix: elm_access; @@ -7,8 +7,8 @@ class Elm.Access (Elm.Widget, Efl.Access.Widget.Action) implements { class.constructor; Efl.Object.constructor; - Elm.Widget.on_access_activate; - Elm.Widget.on_focus_update; + Efl.Ui.Widget.on_access_activate; + Efl.Ui.Widget.on_focus_update; Efl.Access.Widget.Action.elm_actions { get; } Efl.Access.state_set { get; } } diff --git a/src/lib/elementary/elm_actionslider.c b/src/lib/elementary/elm_actionslider.c index 1fdbf2992d..1c45951256 100644 --- a/src/lib/elementary/elm_actionslider.c +++ b/src/lib/elementary/elm_actionslider.c @@ -113,7 +113,7 @@ _mirroredness_change_eval(Evas_Object *obj) } EOLIAN static Efl_Ui_Theme_Apply -_elm_actionslider_elm_widget_theme_apply(Eo *obj, Elm_Actionslider_Data *sd EINA_UNUSED) +_elm_actionslider_efl_ui_widget_theme_apply(Eo *obj, Elm_Actionslider_Data *sd EINA_UNUSED) { Eina_Bool mirrored; Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; diff --git a/src/lib/elementary/elm_actionslider.eo b/src/lib/elementary/elm_actionslider.eo index d400723c6e..30f78db6a3 100644 --- a/src/lib/elementary/elm_actionslider.eo +++ b/src/lib/elementary/elm_actionslider.eo @@ -71,7 +71,7 @@ class Elm.Actionslider (Efl.Ui.Layout, Efl.Ui.Selectable) implements { class.constructor; Efl.Object.constructor; - Elm.Widget.theme_apply; + Efl.Ui.Widget.theme_apply; Efl.Part.part; } events { diff --git a/src/lib/elementary/elm_box.c b/src/lib/elementary/elm_box.c index 6b4a8868d7..a7acdd48a7 100644 --- a/src/lib/elementary/elm_box.c +++ b/src/lib/elementary/elm_box.c @@ -27,14 +27,14 @@ static void _elm_box_efl_ui_focus_composition_prepare(Eo *obj, Elm_Box_Data *pd EINA_UNUSED) { Eina_List *n, *nn; - Elm_Widget *elem; + Efl_Ui_Widget *elem; - Elm_Widget_Smart_Data *wpd = efl_data_scope_get(obj, ELM_WIDGET_CLASS); + Elm_Widget_Smart_Data *wpd = efl_data_scope_get(obj, EFL_UI_WIDGET_CLASS); Eina_List *order = evas_object_box_children_get(wpd->resize_obj); EINA_LIST_FOREACH_SAFE(order, n, nn, elem) { - if (!efl_isa(elem, ELM_WIDGET_CLASS)) + if (!efl_isa(elem, EFL_UI_WIDGET_CLASS)) order = eina_list_remove(order, elem); } @@ -58,7 +58,7 @@ _child_removed_cb_proxy(void *data, const Efl_Event *event) } EOLIAN static Efl_Ui_Theme_Apply -_elm_box_elm_widget_theme_apply(Eo *obj, Elm_Box_Data *sd EINA_UNUSED) +_elm_box_efl_ui_widget_theme_apply(Eo *obj, Elm_Box_Data *sd EINA_UNUSED) { Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; @@ -97,7 +97,7 @@ _on_size_hints_changed(void *data, } EOLIAN static Eina_Bool -_elm_box_elm_widget_widget_sub_object_del(Eo *obj, Elm_Box_Data *_pd EINA_UNUSED, Evas_Object *child) +_elm_box_efl_ui_widget_widget_sub_object_del(Eo *obj, Elm_Box_Data *_pd EINA_UNUSED, Evas_Object *child) { Eina_Bool int_ret = EINA_FALSE; diff --git a/src/lib/elementary/elm_box.eo b/src/lib/elementary/elm_box.eo index 8822c1cc5b..924959907c 100644 --- a/src/lib/elementary/elm_box.eo +++ b/src/lib/elementary/elm_box.eo @@ -1,6 +1,6 @@ import evas_box; -class Elm.Box (Elm.Widget, Efl.Ui.Focus.Composition) +class Elm.Box (Efl.Ui.Widget, Efl.Ui.Focus.Composition) { [[Elementary box class]] legacy_prefix: elm_box; @@ -249,8 +249,8 @@ class Elm.Box (Elm.Widget, Efl.Ui.Focus.Composition) class.constructor; Efl.Object.constructor; Efl.Canvas.Group.group_calculate; - Elm.Widget.theme_apply; - Elm.Widget.widget_sub_object_del; + Efl.Ui.Widget.theme_apply; + Efl.Ui.Widget.widget_sub_object_del; Efl.Ui.Focus.Composition.prepare; } events { diff --git a/src/lib/elementary/elm_bubble.c b/src/lib/elementary/elm_bubble.c index 7747809f70..3c7ab9fd5d 100644 --- a/src/lib/elementary/elm_bubble.c +++ b/src/lib/elementary/elm_bubble.c @@ -173,7 +173,7 @@ _elm_bubble_efl_canvas_group_group_add(Eo *obj, Elm_Bubble_Data *priv) } EOLIAN static void -_elm_bubble_elm_widget_on_access_update(Eo *obj, Elm_Bubble_Data *_pd EINA_UNUSED, Eina_Bool is_access) +_elm_bubble_efl_ui_widget_on_access_update(Eo *obj, Elm_Bubble_Data *_pd EINA_UNUSED, Eina_Bool is_access) { ELM_BUBBLE_CHECK(obj); diff --git a/src/lib/elementary/elm_bubble.eo b/src/lib/elementary/elm_bubble.eo index df62e212ef..f696846831 100644 --- a/src/lib/elementary/elm_bubble.eo +++ b/src/lib/elementary/elm_bubble.eo @@ -38,7 +38,7 @@ class Elm.Bubble (Efl.Ui.Layout, Efl.Ui.Clickable) implements { class.constructor; Efl.Object.constructor; - Elm.Widget.on_access_update; + Efl.Ui.Widget.on_access_update; Efl.Part.part; } } diff --git a/src/lib/elementary/elm_calendar.c b/src/lib/elementary/elm_calendar.c index 2aff58223b..6ceed279cd 100644 --- a/src/lib/elementary/elm_calendar.c +++ b/src/lib/elementary/elm_calendar.c @@ -859,7 +859,7 @@ _spinner_buttons_add(Evas_Object *obj, Elm_Calendar_Data *sd) } EOLIAN static Efl_Ui_Theme_Apply -_elm_calendar_elm_widget_theme_apply(Eo *obj, Elm_Calendar_Data *sd) +_elm_calendar_efl_ui_widget_theme_apply(Eo *obj, Elm_Calendar_Data *sd) { Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; @@ -1386,7 +1386,7 @@ _key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED) } EOLIAN static Eina_Bool -_elm_calendar_elm_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, Elm_Object_Item *item EINA_UNUSED) { Eina_Bool int_ret = EINA_FALSE; @@ -1593,7 +1593,7 @@ _access_obj_process(Evas_Object *obj, Eina_Bool is_access) } EOLIAN static void -_elm_calendar_elm_widget_on_access_update(Eo *obj EINA_UNUSED, Elm_Calendar_Data *_pd EINA_UNUSED, Eina_Bool acs) +_elm_calendar_efl_ui_widget_on_access_update(Eo *obj EINA_UNUSED, Elm_Calendar_Data *_pd EINA_UNUSED, Eina_Bool acs) { _elm_calendar_smart_focus_next_enable = acs; _access_obj_process(obj, _elm_calendar_smart_focus_next_enable); diff --git a/src/lib/elementary/elm_calendar.eo b/src/lib/elementary/elm_calendar.eo index 81f7c93c38..952db0db6a 100644 --- a/src/lib/elementary/elm_calendar.eo +++ b/src/lib/elementary/elm_calendar.eo @@ -412,10 +412,10 @@ class Elm.Calendar (Efl.Ui.Layout, Efl.Ui.Focus.Composition, Efl.Access.Widget.A class.constructor; Efl.Object.constructor; Efl.Canvas.Group.group_calculate; - Elm.Widget.theme_apply; - Elm.Widget.on_access_update; - Elm.Widget.on_focus_update; - Elm.Widget.widget_event; + Efl.Ui.Widget.theme_apply; + Efl.Ui.Widget.on_access_update; + Efl.Ui.Widget.on_focus_update; + Efl.Ui.Widget.widget_event; Efl.Access.Widget.Action.elm_actions { get; } } events { diff --git a/src/lib/elementary/elm_clock.c b/src/lib/elementary/elm_clock.c index 95a03df743..a7f758e563 100644 --- a/src/lib/elementary/elm_clock.c +++ b/src/lib/elementary/elm_clock.c @@ -605,7 +605,7 @@ _time_update(Evas_Object *obj, Eina_Bool theme_update) } EOLIAN static Efl_Ui_Theme_Apply -_elm_clock_elm_widget_theme_apply(Eo *obj, Elm_Clock_Data *sd EINA_UNUSED) +_elm_clock_efl_ui_widget_theme_apply(Eo *obj, Elm_Clock_Data *sd EINA_UNUSED) { Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; @@ -765,7 +765,7 @@ _access_obj_process(Evas_Object *obj, Eina_Bool is_access) } EOLIAN static void -_elm_clock_elm_widget_on_access_update(Eo *obj EINA_UNUSED, Elm_Clock_Data *_pd EINA_UNUSED, Eina_Bool acs) +_elm_clock_efl_ui_widget_on_access_update(Eo *obj EINA_UNUSED, Elm_Clock_Data *_pd EINA_UNUSED, Eina_Bool acs) { _elm_clock_smart_focus_next_enable = acs; _access_obj_process(obj, _elm_clock_smart_focus_next_enable); diff --git a/src/lib/elementary/elm_clock.eo b/src/lib/elementary/elm_clock.eo index b519c1aeab..16e4868b17 100644 --- a/src/lib/elementary/elm_clock.eo +++ b/src/lib/elementary/elm_clock.eo @@ -163,8 +163,8 @@ class Elm.Clock (Efl.Ui.Layout, Efl.Ui.Focus.Composition) implements { class.constructor; Efl.Object.constructor; - Elm.Widget.on_access_update; - Elm.Widget.theme_apply; + Efl.Ui.Widget.on_access_update; + Efl.Ui.Widget.theme_apply; } events { changed; [[The clock's user changed the time]] diff --git a/src/lib/elementary/elm_code_widget.c b/src/lib/elementary/elm_code_widget.c index 394e15885a..dee9751fb9 100644 --- a/src/lib/elementary/elm_code_widget.c +++ b/src/lib/elementary/elm_code_widget.c @@ -1811,7 +1811,7 @@ _elm_code_widget_scroll_event_cb(void *data, Evas_Object *obj EINA_UNUSED, } EOLIAN static Eina_Bool -_elm_code_widget_elm_widget_widget_event(Eo *obj EINA_UNUSED, Elm_Code_Widget_Data *pd EINA_UNUSED, const Efl_Event *eo_event, Evas_Object *src EINA_UNUSED) +_elm_code_widget_efl_ui_widget_widget_event(Eo *obj EINA_UNUSED, Elm_Code_Widget_Data *pd EINA_UNUSED, const Efl_Event *eo_event, Evas_Object *src EINA_UNUSED) { Eo *ev = eo_event->info; @@ -2242,7 +2242,7 @@ _elm_code_widget_cursor_position_get(Eo *obj EINA_UNUSED, Elm_Code_Widget_Data * } EOLIAN static Efl_Ui_Theme_Apply -_elm_code_widget_elm_widget_theme_apply(Eo *obj, Elm_Code_Widget_Data *pd) +_elm_code_widget_efl_ui_widget_theme_apply(Eo *obj, Elm_Code_Widget_Data *pd) { Eo *edje; int r, g, b, a; @@ -2275,7 +2275,7 @@ _elm_code_widget_alpha_set(Eo *obj, Elm_Code_Widget_Data *pd, int alpha) { pd->alpha = alpha; - _elm_code_widget_elm_widget_theme_apply(obj, pd); + _elm_code_widget_efl_ui_widget_theme_apply(obj, pd); } EOLIAN static void @@ -2288,7 +2288,7 @@ _elm_code_widget_efl_canvas_group_group_add(Eo *obj, Elm_Code_Widget_Data *pd) if (!elm_widget_theme_klass_get(obj)) elm_widget_theme_klass_set(obj, "code"); elm_widget_theme_element_set(obj, "layout"); - _elm_code_widget_elm_widget_theme_apply(obj, pd); + _elm_code_widget_efl_ui_widget_theme_apply(obj, pd); efl_canvas_group_add(efl_super(obj, ELM_CODE_WIDGET_CLASS)); elm_object_focus_allow_set(obj, EINA_TRUE); diff --git a/src/lib/elementary/elm_code_widget.eo b/src/lib/elementary/elm_code_widget.eo index 9dbdc48b07..63a6e84be0 100644 --- a/src/lib/elementary/elm_code_widget.eo +++ b/src/lib/elementary/elm_code_widget.eo @@ -311,8 +311,8 @@ class Elm.Code_Widget (Efl.Ui.Layout, Efl.Access.Text) class.constructor; Efl.Object.constructor; Efl.Object.finalize; - Elm.Widget.widget_event; - Elm.Widget.theme_apply; + Efl.Ui.Widget.widget_event; + Efl.Ui.Widget.theme_apply; } constructors { .code; diff --git a/src/lib/elementary/elm_colorselector.c b/src/lib/elementary/elm_colorselector.c index 2c2856be95..ef6fe455ac 100644 --- a/src/lib/elementary/elm_colorselector.c +++ b/src/lib/elementary/elm_colorselector.c @@ -1318,7 +1318,7 @@ _color_bars_add(Evas_Object *obj) } EOLIAN static Efl_Ui_Theme_Apply -_elm_colorselector_elm_widget_theme_apply(Eo *obj, Elm_Colorselector_Data *sd) +_elm_colorselector_efl_ui_widget_theme_apply(Eo *obj, Elm_Colorselector_Data *sd) { int i; Eina_List *elist; @@ -2243,7 +2243,7 @@ _access_obj_process(Evas_Object *obj, Eina_Bool is_access) } EOLIAN static Eina_Rect -_elm_colorselector_elm_widget_focus_highlight_geometry_get(Eo *obj EINA_UNUSED, Elm_Colorselector_Data *sd) +_elm_colorselector_efl_ui_widget_focus_highlight_geometry_get(Eo *obj EINA_UNUSED, Elm_Colorselector_Data *sd) { if (sd->focused_item && (sd->focused == ELM_COLORSELECTOR_PALETTE)) { @@ -2257,7 +2257,7 @@ _elm_colorselector_elm_widget_focus_highlight_geometry_get(Eo *obj EINA_UNUSED, } EOLIAN static void -_elm_colorselector_elm_widget_on_access_update(Eo *obj, Elm_Colorselector_Data *_pd EINA_UNUSED, Eina_Bool acs) +_elm_colorselector_efl_ui_widget_on_access_update(Eo *obj, Elm_Colorselector_Data *_pd EINA_UNUSED, Eina_Bool acs) { _elm_colorselector_smart_focus_next_enable = acs; _access_obj_process(obj, _elm_colorselector_smart_focus_next_enable); diff --git a/src/lib/elementary/elm_colorselector.eo b/src/lib/elementary/elm_colorselector.eo index b7b41907f7..2449b8b83d 100644 --- a/src/lib/elementary/elm_colorselector.eo +++ b/src/lib/elementary/elm_colorselector.eo @@ -108,10 +108,10 @@ class Elm.Colorselector (Efl.Ui.Layout, Efl.Ui.Focus.Composition, implements { class.constructor; Efl.Object.constructor; - Elm.Widget.theme_apply; - Elm.Widget.focus_highlight_geometry { get; } - Elm.Widget.on_access_update; - Elm.Widget.widget_event; + Efl.Ui.Widget.theme_apply; + Efl.Ui.Widget.focus_highlight_geometry { get; } + Efl.Ui.Widget.on_access_update; + Efl.Ui.Widget.widget_event; Efl.Access.Widget.Action.elm_actions { get; } Efl.Access.children { get; } } diff --git a/src/lib/elementary/elm_combobox.eo b/src/lib/elementary/elm_combobox.eo index 4758cca6eb..d0c914b37d 100644 --- a/src/lib/elementary/elm_combobox.eo +++ b/src/lib/elementary/elm_combobox.eo @@ -39,9 +39,9 @@ class Elm.Combobox (Efl.Ui.Button, Efl.Ui.Selectable, Efl.Object.constructor; Efl.Gfx.visible { set; } Efl.Gfx.size { set; } - Elm.Widget.theme_apply; + Efl.Ui.Widget.theme_apply; Efl.Ui.Translatable.translation_update; - Elm.Widget.widget_event; + Efl.Ui.Widget.widget_event; Efl.Ui.Autorepeat.autorepeat_supported { get; } Elm.Genlist.filter { set; } Efl.Access.Widget.Action.elm_actions { get; } diff --git a/src/lib/elementary/elm_conform.c b/src/lib/elementary/elm_conform.c index 55f04de82a..d26da4bd41 100644 --- a/src/lib/elementary/elm_conform.c +++ b/src/lib/elementary/elm_conform.c @@ -574,7 +574,7 @@ _on_rotation_changed(void *data, const Efl_Event *event EINA_UNUSED) } EOLIAN static Efl_Ui_Theme_Apply -_elm_conformant_elm_widget_theme_apply(Eo *obj, Elm_Conformant_Data *_pd EINA_UNUSED) +_elm_conformant_efl_ui_widget_theme_apply(Eo *obj, Elm_Conformant_Data *_pd EINA_UNUSED) { Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; @@ -966,7 +966,7 @@ _elm_conformant_efl_canvas_group_group_del(Eo *obj, Elm_Conformant_Data *sd) } EOLIAN static void -_elm_conformant_elm_widget_widget_parent_set(Eo *obj, Elm_Conformant_Data *sd, Evas_Object *parent) +_elm_conformant_efl_ui_widget_widget_parent_set(Eo *obj, Elm_Conformant_Data *sd, Evas_Object *parent) { #ifdef HAVE_ELEMENTARY_X Evas_Object *top = elm_widget_top_get(parent); diff --git a/src/lib/elementary/elm_conformant.eo b/src/lib/elementary/elm_conformant.eo index f289493106..66a3632dbf 100644 --- a/src/lib/elementary/elm_conformant.eo +++ b/src/lib/elementary/elm_conformant.eo @@ -7,8 +7,8 @@ class Elm.Conformant (Efl.Ui.Layout) implements { class.constructor; Efl.Object.constructor; - Elm.Widget.widget_parent { set; } - Elm.Widget.theme_apply; + Efl.Ui.Widget.widget_parent { set; } + Efl.Ui.Widget.theme_apply; } events { virtualkeypad,state,on; [[Called when virtualkeypad was enabled]] diff --git a/src/lib/elementary/elm_ctxpopup.eo b/src/lib/elementary/elm_ctxpopup.eo index 4166ace696..f759dcb7d2 100644 --- a/src/lib/elementary/elm_ctxpopup.eo +++ b/src/lib/elementary/elm_ctxpopup.eo @@ -201,13 +201,13 @@ class Elm.Ctxpopup (Efl.Ui.Layout, Efl.Ui.Focus.Layer, Efl.Access.Widget.Action, implements { class.constructor; Efl.Object.constructor; - Elm.Widget.widget_parent { set; } - Elm.Widget.on_disabled_update; - Elm.Widget.widget_sub_object_add; + Efl.Ui.Widget.widget_parent { set; } + Efl.Ui.Widget.on_disabled_update; + Efl.Ui.Widget.widget_sub_object_add; Efl.Ui.Translatable.translation_update; - Elm.Widget.theme_apply; - Elm.Widget.widget_event; - Elm.Widget.focused_item { get; } + Efl.Ui.Widget.theme_apply; + Efl.Ui.Widget.widget_event; + Efl.Ui.Widget.focused_item { get; } Efl.Ui.Menu.selected_item { get; } Efl.Ui.Menu.first_item { get; } Efl.Ui.Menu.last_item { get; } diff --git a/src/lib/elementary/elm_dayselector.c b/src/lib/elementary/elm_dayselector.c index 68b8dd8066..389bc5217f 100644 --- a/src/lib/elementary/elm_dayselector.c +++ b/src/lib/elementary/elm_dayselector.c @@ -123,7 +123,7 @@ _item_location_get(Elm_Dayselector_Data *sd, } EOLIAN static Efl_Ui_Theme_Apply -_elm_dayselector_elm_widget_theme_apply(Eo *obj, Elm_Dayselector_Data *sd) +_elm_dayselector_efl_ui_widget_theme_apply(Eo *obj, Elm_Dayselector_Data *sd) { Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; diff --git a/src/lib/elementary/elm_dayselector.eo b/src/lib/elementary/elm_dayselector.eo index c5135da6ea..39427aa820 100644 --- a/src/lib/elementary/elm_dayselector.eo +++ b/src/lib/elementary/elm_dayselector.eo @@ -151,7 +151,7 @@ class Elm.Dayselector (Efl.Ui.Layout) implements { class.constructor; Efl.Object.constructor; - Elm.Widget.theme_apply; + Efl.Ui.Widget.theme_apply; Efl.Ui.Translatable.translation_update; Efl.Part.part; } diff --git a/src/lib/elementary/elm_diskselector.c b/src/lib/elementary/elm_diskselector.c index 1a96a8ce61..29a553bb11 100644 --- a/src/lib/elementary/elm_diskselector.c +++ b/src/lib/elementary/elm_diskselector.c @@ -812,7 +812,7 @@ _theme_data_get(Evas_Object *obj) } EOLIAN static Efl_Ui_Theme_Apply -_elm_diskselector_elm_widget_theme_apply(Eo *obj, Elm_Diskselector_Data *sd) +_elm_diskselector_efl_ui_widget_theme_apply(Eo *obj, Elm_Diskselector_Data *sd) { Eina_List *l; Elm_Diskselector_Item_Data *it; @@ -872,7 +872,7 @@ _elm_diskselector_elm_widget_theme_apply(Eo *obj, Elm_Diskselector_Data *sd) } EOLIAN static Eina_Bool -_elm_diskselector_elm_widget_widget_sub_object_del(Eo *obj, Elm_Diskselector_Data *sd, Evas_Object *sobj) +_elm_diskselector_efl_ui_widget_widget_sub_object_del(Eo *obj, Elm_Diskselector_Data *sd, Evas_Object *sobj) { Eina_Bool int_ret = EINA_FALSE; @@ -897,7 +897,7 @@ _elm_diskselector_elm_widget_widget_sub_object_del(Eo *obj, Elm_Diskselector_Dat } EOLIAN static Eina_Bool -_elm_diskselector_elm_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, Elm_Object_Item *item EINA_UNUSED) { Eina_Bool int_ret = EINA_FALSE; ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); @@ -1398,7 +1398,7 @@ _elm_diskselector_efl_canvas_group_group_member_add(Eo *obj, Elm_Diskselector_Da } EOLIAN static void -_elm_diskselector_elm_widget_on_access_update(Eo *obj EINA_UNUSED, Elm_Diskselector_Data *_pd EINA_UNUSED, Eina_Bool acs) +_elm_diskselector_efl_ui_widget_on_access_update(Eo *obj EINA_UNUSED, Elm_Diskselector_Data *_pd EINA_UNUSED, Eina_Bool acs) { _elm_diskselector_smart_focus_next_enable = acs; } diff --git a/src/lib/elementary/elm_diskselector.eo b/src/lib/elementary/elm_diskselector.eo index 635ea341fd..6a179713f1 100644 --- a/src/lib/elementary/elm_diskselector.eo +++ b/src/lib/elementary/elm_diskselector.eo @@ -1,4 +1,4 @@ -class Elm.Diskselector (Elm.Widget, Elm.Interface_Scrollable, +class Elm.Diskselector (Efl.Ui.Widget, Elm.Interface_Scrollable, Efl.Access.Widget.Action, Efl.Ui.Clickable, Efl.Ui.Scrollable, Efl.Ui.Selectable) @@ -201,12 +201,12 @@ class Elm.Diskselector (Elm.Widget, Elm.Interface_Scrollable, Efl.Gfx.position { set; } Efl.Gfx.size { set; } Efl.Canvas.Group.group_member_add; - Elm.Widget.on_access_update; - Elm.Widget.theme_apply; - Elm.Widget.on_focus_update; + Efl.Ui.Widget.on_access_update; + Efl.Ui.Widget.theme_apply; + Efl.Ui.Widget.on_focus_update; Efl.Ui.Translatable.translation_update; - Elm.Widget.widget_sub_object_del; - Elm.Widget.widget_event; + Efl.Ui.Widget.widget_sub_object_del; + Efl.Ui.Widget.widget_event; Elm.Interface_Scrollable.policy { get; set; } Efl.Access.Widget.Action.elm_actions { get; } } diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c index 854f234029..103de3fa32 100644 --- a/src/lib/elementary/elm_entry.c +++ b/src/lib/elementary/elm_entry.c @@ -793,7 +793,7 @@ _get_drop_format(Evas_Object *obj) /* we can't reuse layout's here, because it's on entry_edje only */ EOLIAN static Eina_Bool -_elm_entry_elm_widget_on_disabled_update(Eo *obj, Elm_Entry_Data *sd, Eina_Bool disabled) +_elm_entry_efl_ui_widget_on_disabled_update(Eo *obj, Elm_Entry_Data *sd, Eina_Bool disabled) { const char *emission; @@ -853,7 +853,7 @@ _elm_entry_background_switch(Evas_Object *from_edje, Evas_Object *to_edje) /* we can't issue the layout's theming code here, cause it assumes an * unique edje object, always */ EOLIAN static Efl_Ui_Theme_Apply -_elm_entry_elm_widget_theme_apply(Eo *obj, Elm_Entry_Data *sd) +_elm_entry_efl_ui_widget_theme_apply(Eo *obj, Elm_Entry_Data *sd) { const char *str; const char *t; @@ -865,7 +865,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 = efl_ui_widget_theme_apply(efl_cast(obj, ELM_WIDGET_CLASS)); + theme_apply = efl_ui_widget_theme_apply(efl_cast(obj, EFL_UI_WIDGET_CLASS)); if (!theme_apply) return EFL_UI_THEME_APPLY_FAILED; evas_event_freeze(evas_object_evas_get(obj)); @@ -1300,7 +1300,7 @@ _elm_entry_focus_update(Eo *obj, Elm_Entry_Data *sd) } EOLIAN static Eina_Bool -_elm_entry_elm_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_Object_Item *item EINA_UNUSED) { _elm_entry_focus_update(obj, sd); @@ -1308,7 +1308,7 @@ _elm_entry_elm_widget_on_focus_update(Eo *obj, Elm_Entry_Data *sd, Elm_Object_It } EOLIAN static Eina_Rect -_elm_entry_elm_widget_interest_region_get(Eo *obj, Elm_Entry_Data *sd) +_elm_entry_efl_ui_widget_interest_region_get(Eo *obj, Elm_Entry_Data *sd) { Evas_Coord cx, cy, cw, ch; Evas_Coord edx, edy; @@ -1346,7 +1346,7 @@ _show_region_hook(void *data EINA_UNUSED, Evas_Object *obj, Eina_Rect r) } EOLIAN static Eina_Bool -_elm_entry_elm_widget_widget_sub_object_del(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, Evas_Object *sobj) +_elm_entry_efl_ui_widget_widget_sub_object_del(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, Evas_Object *sobj) { Eina_Bool ret = EINA_FALSE; /* unfortunately entry doesn't follow the signal pattern @@ -5440,7 +5440,7 @@ _activate(Evas_Object *obj) } EOLIAN static Eina_Bool -_elm_entry_elm_widget_on_access_activate(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, Efl_Ui_Activate act) +_elm_entry_efl_ui_widget_on_access_activate(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, Efl_Ui_Activate act) { if (act != EFL_UI_ACTIVATE_DEFAULT) return EINA_FALSE; _activate(obj); diff --git a/src/lib/elementary/elm_entry.eo b/src/lib/elementary/elm_entry.eo index a6015a97a3..f4c8fc504d 100644 --- a/src/lib/elementary/elm_entry.eo +++ b/src/lib/elementary/elm_entry.eo @@ -845,12 +845,12 @@ class Elm.Entry (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable, Efl.Layout.Signal.signal_callback_add; Efl.Layout.Signal.signal_callback_del; Efl.Layout.Signal.signal_emit; - Elm.Widget.on_access_activate; - Elm.Widget.theme_apply; - Elm.Widget.on_focus_update; - Elm.Widget.interest_region { get; } - Elm.Widget.on_disabled_update; - Elm.Widget.widget_sub_object_del; + Efl.Ui.Widget.on_access_activate; + Efl.Ui.Widget.theme_apply; + Efl.Ui.Widget.on_focus_update; + Efl.Ui.Widget.interest_region { get; } + Efl.Ui.Widget.on_disabled_update; + Efl.Ui.Widget.widget_sub_object_del; Elm.Interface_Scrollable.policy { set; } Elm.Interface_Scrollable.bounce_allow { set; } Efl.Access.state_set { get; } diff --git a/src/lib/elementary/elm_fileselector.eo b/src/lib/elementary/elm_fileselector.eo index ea97c274f4..c1a4e43bbc 100644 --- a/src/lib/elementary/elm_fileselector.eo +++ b/src/lib/elementary/elm_fileselector.eo @@ -35,9 +35,9 @@ class Elm.Fileselector (Efl.Ui.Layout, Elm.Interface.Fileselector, class.constructor; class.destructor; Efl.Object.constructor; - Elm.Widget.widget_event; - Elm.Widget.theme_apply; - Elm.Widget.focus_state_apply; + Efl.Ui.Widget.widget_event; + Efl.Ui.Widget.theme_apply; + Efl.Ui.Widget.focus_state_apply; Elm.Interface.Fileselector.selected_models { get; } Elm.Interface.Fileselector.selected_model_get; Elm.Interface.Fileselector.selected_model_set; diff --git a/src/lib/elementary/elm_fileselector_button.eo b/src/lib/elementary/elm_fileselector_button.eo index 5cfcb544bc..728a086c21 100644 --- a/src/lib/elementary/elm_fileselector_button.eo +++ b/src/lib/elementary/elm_fileselector_button.eo @@ -4,7 +4,7 @@ class Elm.Fileselector_Button (Efl.Ui.Button, Elm.Interface.Fileselector) event_prefix: elm_fileselector_button; implements { Efl.Object.constructor; - Elm.Widget.theme_apply; + Efl.Ui.Widget.theme_apply; Efl.Ui.Autorepeat.autorepeat_supported { get; } Elm.Interface.Fileselector.selected_models { get; } Elm.Interface.Fileselector.expandable { get; set; } diff --git a/src/lib/elementary/elm_fileselector_entry.eo b/src/lib/elementary/elm_fileselector_entry.eo index df857f241e..1b267b890b 100644 --- a/src/lib/elementary/elm_fileselector_entry.eo +++ b/src/lib/elementary/elm_fileselector_entry.eo @@ -6,8 +6,8 @@ class Elm.Fileselector_Entry (Efl.Ui.Layout, Elm.Interface.Fileselector, implements { class.constructor; Efl.Object.constructor; - Elm.Widget.theme_apply; - Elm.Widget.on_disabled_update; + Efl.Ui.Widget.theme_apply; + Efl.Ui.Widget.on_disabled_update; Elm.Interface.Fileselector.selected_model_get; Elm.Interface.Fileselector.selected_model_set; Elm.Interface.Fileselector.folder_only { get; set; } diff --git a/src/lib/elementary/elm_flipselector.c b/src/lib/elementary/elm_flipselector.c index ac69bd6ff2..ac1cc717a0 100644 --- a/src/lib/elementary/elm_flipselector.c +++ b/src/lib/elementary/elm_flipselector.c @@ -351,7 +351,7 @@ _item_new(Evas_Object *obj, } EOLIAN static Efl_Ui_Theme_Apply -_elm_flipselector_elm_widget_theme_apply(Eo *obj, Elm_Flipselector_Data *sd) +_elm_flipselector_efl_ui_widget_theme_apply(Eo *obj, Elm_Flipselector_Data *sd) { const char *max_len; diff --git a/src/lib/elementary/elm_flipselector.eo b/src/lib/elementary/elm_flipselector.eo index 4ba48de66e..0ed8c610f3 100644 --- a/src/lib/elementary/elm_flipselector.eo +++ b/src/lib/elementary/elm_flipselector.eo @@ -161,8 +161,8 @@ class Elm.Flipselector (Efl.Ui.Layout, Efl.Ui.Range, implements { class.constructor; Efl.Object.constructor; - Elm.Widget.theme_apply; - Elm.Widget.widget_event; + Efl.Ui.Widget.theme_apply; + Efl.Ui.Widget.widget_event; Efl.Ui.Range.range_min_max { get; set; } Efl.Ui.Range.range_step { get; set; } Efl.Ui.Range.range_value { get; set; } diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c index 4db2ed1f4a..7dd31730fc 100644 --- a/src/lib/elementary/elm_gengrid.c +++ b/src/lib/elementary/elm_gengrid.c @@ -3498,7 +3498,7 @@ _elm_gengrid_nearest_visible_item_get(Evas_Object *obj, Elm_Object_Item *eo_it) } EOLIAN static Eina_Rect -_elm_gengrid_elm_widget_interest_region_get(Eo *obj, Elm_Gengrid_Data *sd) +_elm_gengrid_efl_ui_widget_interest_region_get(Eo *obj, Elm_Gengrid_Data *sd) { Eina_Rect r = {}; @@ -3547,7 +3547,7 @@ _mirrored_set(Evas_Object *obj, } EOLIAN static Efl_Ui_Theme_Apply -_elm_gengrid_elm_widget_theme_apply(Eo *obj, Elm_Gengrid_Data *sd EINA_UNUSED) +_elm_gengrid_efl_ui_widget_theme_apply(Eo *obj, Elm_Gengrid_Data *sd EINA_UNUSED) { Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); @@ -4166,7 +4166,7 @@ _access_obj_process(Elm_Gengrid_Data * sd, Eina_Bool is_access) } EOLIAN static void -_elm_gengrid_elm_widget_on_access_update(Eo *obj EINA_UNUSED, Elm_Gengrid_Data *sd, Eina_Bool acs) +_elm_gengrid_efl_ui_widget_on_access_update(Eo *obj EINA_UNUSED, Elm_Gengrid_Data *sd, Eina_Bool acs) { _elm_gengrid_smart_focus_next_enable = acs; _access_obj_process(sd, _elm_gengrid_smart_focus_next_enable); @@ -4218,7 +4218,7 @@ static void _gengrid_element_focused(void *data, const Efl_Event *ev) { ELM_GENGRID_DATA_GET(data, pd); - Elm_Widget *focused = efl_ui_focus_manager_focus_get(ev->object); + Efl_Ui_Widget *focused = efl_ui_focus_manager_focus_get(ev->object); Elm_Widget_Item *item; if (!focused) return; @@ -5450,7 +5450,7 @@ elm_gengrid_nth_item_get(const Evas_Object *obj, unsigned int nth) } EOLIAN static Eina_Rect -_elm_gengrid_elm_widget_focus_highlight_geometry_get(Eo *obj, Elm_Gengrid_Data *sd) +_elm_gengrid_efl_ui_widget_focus_highlight_geometry_get(Eo *obj, Elm_Gengrid_Data *sd) { Evas_Coord ox, oy, oh, ow, item_x = 0, item_y = 0, item_w = 0, item_h = 0; Eina_Rect r = {}; @@ -5501,7 +5501,7 @@ _elm_gengrid_elm_widget_focus_highlight_geometry_get(Eo *obj, Elm_Gengrid_Data * } EOLIAN static Elm_Object_Item * -_elm_gengrid_elm_widget_focused_item_get(Eo *obj EINA_UNUSED, Elm_Gengrid_Data *sd) +_elm_gengrid_efl_ui_widget_focused_item_get(Eo *obj EINA_UNUSED, Elm_Gengrid_Data *sd) { return sd->focused_item; } @@ -5722,7 +5722,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, Efl_Ui_Widget_Focus_State current_state, Efl_Ui_Widget_Focus_State *configured_state, Elm_Widget *redirect EINA_UNUSED) +_elm_gengrid_efl_ui_widget_focus_state_apply(Eo *obj, Elm_Gengrid_Data *pd EINA_UNUSED, Efl_Ui_Widget_Focus_State current_state, Efl_Ui_Widget_Focus_State *configured_state, Efl_Ui_Widget *redirect EINA_UNUSED) { return efl_ui_widget_focus_state_apply(efl_super(obj, MY_CLASS), current_state, configured_state, obj); } @@ -5731,13 +5731,13 @@ EOLIAN static void _elm_gengrid_item_efl_ui_focus_object_prepare_logical(Eo *obj, Elm_Gen_Item *pd) { Eina_List *n; - Elm_Widget *wid; + Efl_Ui_Widget *wid; _item_realize(pd); EINA_LIST_FOREACH(pd->contents, n, wid) { - if (efl_isa(wid, ELM_WIDGET_CLASS)) + if (efl_isa(wid, EFL_UI_WIDGET_CLASS)) _elm_widget_full_eval(wid); } diff --git a/src/lib/elementary/elm_gengrid.eo b/src/lib/elementary/elm_gengrid.eo index 133b20d51d..7a06679f4f 100644 --- a/src/lib/elementary/elm_gengrid.eo +++ b/src/lib/elementary/elm_gengrid.eo @@ -548,12 +548,12 @@ class Elm.Gengrid (Efl.Ui.Layout, Efl.Ui.Focus.Composition, Elm.Interface_Scroll Efl.Gfx.position { set; } Efl.Gfx.size { set; } Efl.Canvas.Group.group_member_add; - Elm.Widget.theme_apply; - Elm.Widget.on_access_update; - Elm.Widget.interest_region { get; } - Elm.Widget.widget_event; - Elm.Widget.focus_highlight_geometry { get; } - Elm.Widget.focused_item { get; } + Efl.Ui.Widget.theme_apply; + Efl.Ui.Widget.on_access_update; + Efl.Ui.Widget.interest_region { get; } + Efl.Ui.Widget.widget_event; + Efl.Ui.Widget.focus_highlight_geometry { get; } + Efl.Ui.Widget.focused_item { get; } Elm.Interface_Scrollable.item_loop_enabled { get; set; } Elm.Interface_Scrollable.bounce_allow { set; } Elm.Interface_Scrollable.policy { get; set; } @@ -569,7 +569,7 @@ class Elm.Gengrid (Efl.Ui.Layout, Efl.Ui.Focus.Composition, Elm.Interface_Scroll Efl.Access.Selection.all_children_select; Efl.Access.Selection.clear; Efl.Ui.Focus.Composition.prepare; - Elm.Widget.focus_state_apply; + Efl.Ui.Widget.focus_state_apply; Efl.Ui.Focus.Manager.setup_on_first_touch; } events { diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c index 07d2fcb087..bfe63a3f21 100644 --- a/src/lib/elementary/elm_genlist.c +++ b/src/lib/elementary/elm_genlist.c @@ -379,9 +379,9 @@ _widget_calculate_recursive(Eo *obj) Eina_List *l; Evas_Object *child; - if (!efl_isa(obj, ELM_WIDGET_CLASS)) return; + if (!efl_isa(obj, EFL_UI_WIDGET_CLASS)) return; - pd = efl_data_scope_get(obj, ELM_WIDGET_CLASS); + pd = efl_data_scope_get(obj, EFL_UI_WIDGET_CLASS); if (!pd) return; if (!efl_canvas_group_need_recalculate_get(obj) && @@ -446,7 +446,7 @@ _item_content_realize(Elm_Gen_Item *it, // FIXME: Genlist item doesn't update its size when the size of // content is changed, so deferred calculation for content should // be performed before realization. - if (efl_isa(content, ELM_WIDGET_CLASS)) + if (efl_isa(content, EFL_UI_WIDGET_CLASS)) { ELM_WIDGET_DATA_GET_OR_RETURN(content, wd); @@ -3273,7 +3273,7 @@ _key_action_escape(Evas_Object *obj, const char *params EINA_UNUSED) } EOLIAN static Eina_Bool -_elm_genlist_elm_widget_widget_sub_object_add(Eo *obj, Elm_Genlist_Data *_pd EINA_UNUSED, Evas_Object *sobj) +_elm_genlist_efl_ui_widget_widget_sub_object_add(Eo *obj, Elm_Genlist_Data *_pd EINA_UNUSED, Evas_Object *sobj) { /* skipping layout's code, which registers size hint changing * callback on sub objects. this is here because items' @@ -3281,11 +3281,11 @@ _elm_genlist_elm_widget_widget_sub_object_add(Eo *obj, Elm_Genlist_Data *_pd EIN * creation, thus issuing TOO MANY sizing_eval()'s here. they are * not needed at here anyway, so let's skip listening to those * hints changes */ - return elm_widget_sub_object_add(efl_cast(obj, ELM_WIDGET_CLASS), sobj); + return elm_widget_sub_object_add(efl_cast(obj, EFL_UI_WIDGET_CLASS), sobj); } EOLIAN static Eina_Bool -_elm_genlist_elm_widget_widget_sub_object_del(Eo *obj, Elm_Genlist_Data *sd, Evas_Object *sobj) +_elm_genlist_efl_ui_widget_widget_sub_object_del(Eo *obj, Elm_Genlist_Data *sd, Evas_Object *sobj) { Eina_Bool int_ret = EINA_FALSE; @@ -3366,7 +3366,7 @@ _elm_genlist_nearest_visible_item_get(Evas_Object *obj, Elm_Object_Item *eo_it) } EOLIAN static Eina_Bool -_elm_genlist_elm_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, Elm_Object_Item *item EINA_UNUSED) { Eina_Bool int_ret = EINA_FALSE; Elm_Object_Item *eo_it = NULL; @@ -3439,7 +3439,7 @@ _mirrored_set(Evas_Object *obj, } EOLIAN static Efl_Ui_Theme_Apply -_elm_genlist_elm_widget_theme_apply(Eo *obj, Elm_Genlist_Data *sd) +_elm_genlist_efl_ui_widget_theme_apply(Eo *obj, Elm_Genlist_Data *sd) { Item_Block *itb; Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; @@ -5785,7 +5785,7 @@ _access_obj_process(Elm_Genlist_Data *sd, Eina_Bool is_access) } EOLIAN static void -_elm_genlist_elm_widget_on_access_update(Eo *obj EINA_UNUSED, Elm_Genlist_Data *sd, Eina_Bool acs) +_elm_genlist_efl_ui_widget_on_access_update(Eo *obj EINA_UNUSED, Elm_Genlist_Data *sd, Eina_Bool acs) { _elm_genlist_smart_focus_next_enable = acs; _access_obj_process(sd, _elm_genlist_smart_focus_next_enable); @@ -5802,7 +5802,7 @@ static void _genlist_element_focused(void *data, const Efl_Event *ev) { ELM_GENLIST_DATA_GET(data, pd); - Elm_Widget *focused = efl_ui_focus_manager_focus_get(ev->object); + Efl_Ui_Widget *focused = efl_ui_focus_manager_focus_get(ev->object); Elm_Widget_Item *item; if (!focused) return; @@ -8481,7 +8481,7 @@ elm_genlist_nth_item_get(const Evas_Object *obj, unsigned int nth) } EOLIAN static Eina_Rect -_elm_genlist_elm_widget_focus_highlight_geometry_get(Eo *obj, Elm_Genlist_Data *sd) +_elm_genlist_efl_ui_widget_focus_highlight_geometry_get(Eo *obj, Elm_Genlist_Data *sd) { Evas_Coord ox, oy, oh, ow, item_x = 0, item_y = 0, item_w = 0, item_h = 0; Eina_Rect r = {}; @@ -8568,7 +8568,7 @@ _elm_genlist_search_by_text_item_get(Eo *obj EINA_UNUSED, } EOLIAN static Elm_Object_Item* -_elm_genlist_elm_widget_focused_item_get(Eo *obj EINA_UNUSED, Elm_Genlist_Data *sd) +_elm_genlist_efl_ui_widget_focused_item_get(Eo *obj EINA_UNUSED, Elm_Genlist_Data *sd) { return sd->focused_item; } @@ -8777,13 +8777,13 @@ EOLIAN static void _elm_genlist_item_efl_ui_focus_object_prepare_logical(Eo *obj, Elm_Gen_Item *pd) { Eina_List *n; - Elm_Widget *wid; + Efl_Ui_Widget *wid; _item_realize(pd, pd->item->order_num_in, EINA_FALSE); EINA_LIST_FOREACH(pd->contents, n, wid) { - if (efl_isa(wid, ELM_WIDGET_CLASS)) + if (efl_isa(wid, EFL_UI_WIDGET_CLASS)) _elm_widget_full_eval(wid); } @@ -8791,7 +8791,7 @@ _elm_genlist_item_efl_ui_focus_object_prepare_logical(Eo *obj, Elm_Gen_Item *pd) } EOLIAN static Eina_Bool -_elm_genlist_elm_widget_focus_state_apply(Eo *obj, Elm_Genlist_Data *pd EINA_UNUSED, Efl_Ui_Widget_Focus_State current_state, Efl_Ui_Widget_Focus_State *configured_state, Elm_Widget *redirect EINA_UNUSED) +_elm_genlist_efl_ui_widget_focus_state_apply(Eo *obj, Elm_Genlist_Data *pd EINA_UNUSED, Efl_Ui_Widget_Focus_State current_state, Efl_Ui_Widget_Focus_State *configured_state, Efl_Ui_Widget *redirect EINA_UNUSED) { return efl_ui_widget_focus_state_apply(efl_super(obj, MY_CLASS), current_state, configured_state, obj); } diff --git a/src/lib/elementary/elm_genlist.eo b/src/lib/elementary/elm_genlist.eo index 1c5d74c8bd..7a88adcf1c 100644 --- a/src/lib/elementary/elm_genlist.eo +++ b/src/lib/elementary/elm_genlist.eo @@ -533,14 +533,14 @@ class Elm.Genlist (Efl.Ui.Layout, Efl.Ui.Focus.Composition, Elm.Interface_Scroll Efl.Gfx.size { set; } Efl.Canvas.Group.group_member_add; Efl.Object.provider_find; - Elm.Widget.theme_apply; - Elm.Widget.widget_sub_object_add; - Elm.Widget.on_access_update; - Elm.Widget.focus_highlight_geometry { get; } - Elm.Widget.on_focus_update; - Elm.Widget.widget_sub_object_del; - Elm.Widget.widget_event; - Elm.Widget.focused_item { get; } + Efl.Ui.Widget.theme_apply; + 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.Widget.widget_sub_object_del; + Efl.Ui.Widget.widget_event; + Efl.Ui.Widget.focused_item { get; } Elm.Interface_Scrollable.item_loop_enabled { get; set; } Elm.Interface_Scrollable.bounce_allow { get; set; } Elm.Interface_Scrollable.policy { get; set; } @@ -556,7 +556,7 @@ class Elm.Genlist (Efl.Ui.Layout, Efl.Ui.Focus.Composition, Elm.Interface_Scroll Efl.Access.Selection.all_children_select; Efl.Access.Selection.clear; Efl.Ui.Focus.Composition.prepare; - Elm.Widget.focus_state_apply; + Efl.Ui.Widget.focus_state_apply; } events { item,focused; [[Called when genlist item got focus]] diff --git a/src/lib/elementary/elm_gesture_layer.c b/src/lib/elementary/elm_gesture_layer.c index 239e7cb826..ae3b353dd1 100644 --- a/src/lib/elementary/elm_gesture_layer.c +++ b/src/lib/elementary/elm_gesture_layer.c @@ -3740,7 +3740,7 @@ _rotate_test(Evas_Object *obj, } EOLIAN static Eina_Bool -_elm_gesture_layer_elm_widget_on_disabled_update(Eo *obj, Elm_Gesture_Layer_Data *_pd EINA_UNUSED, Eina_Bool disabled) +_elm_gesture_layer_efl_ui_widget_on_disabled_update(Eo *obj, Elm_Gesture_Layer_Data *_pd EINA_UNUSED, Eina_Bool disabled) { if (disabled) _callbacks_unregister(obj); diff --git a/src/lib/elementary/elm_gesture_layer.eo b/src/lib/elementary/elm_gesture_layer.eo index 3406b886f5..2e590946cb 100644 --- a/src/lib/elementary/elm_gesture_layer.eo +++ b/src/lib/elementary/elm_gesture_layer.eo @@ -31,7 +31,7 @@ enum Elm.Gesture.State abort [[Ongoing gesture was aborted]] } -class Elm.Gesture_Layer (Elm.Widget) +class Elm.Gesture_Layer (Efl.Ui.Widget) { [[Elementary gesture layer class]] legacy_prefix: elm_gesture_layer; @@ -162,6 +162,6 @@ class Elm.Gesture_Layer (Elm.Widget) implements { class.constructor; Efl.Object.constructor; - Elm.Widget.on_disabled_update; + Efl.Ui.Widget.on_disabled_update; } } diff --git a/src/lib/elementary/elm_glview.c b/src/lib/elementary/elm_glview.c index 44f7a8de94..986629f8f8 100644 --- a/src/lib/elementary/elm_glview.c +++ b/src/lib/elementary/elm_glview.c @@ -27,7 +27,7 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = { }; EOLIAN static Eina_Bool -_elm_glview_elm_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_Object_Item *item EINA_UNUSED) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); Eina_Bool int_ret = EINA_FALSE; diff --git a/src/lib/elementary/elm_glview.eo b/src/lib/elementary/elm_glview.eo index 7c5b06e7d7..c44946f229 100644 --- a/src/lib/elementary/elm_glview.eo +++ b/src/lib/elementary/elm_glview.eo @@ -80,7 +80,7 @@ enum Elm.GLView.Render.Policy always = 2 [[Render always even when it is not visible]] } -class Elm.Glview (Elm.Widget, Efl.Gfx.View) +class Elm.Glview (Efl.Ui.Widget, Efl.Gfx.View) { [[Elementary GL view class]] legacy_prefix: elm_glview; @@ -190,7 +190,7 @@ class Elm.Glview (Elm.Widget, Efl.Gfx.View) class.constructor; Efl.Object.finalize; Efl.Gfx.size { set; } - Elm.Widget.on_focus_update; + Efl.Ui.Widget.on_focus_update; Efl.Gfx.View.view_size { get; set; } } events { diff --git a/src/lib/elementary/elm_grid.c b/src/lib/elementary/elm_grid.c index f189a7ddcf..d93c1003a0 100644 --- a/src/lib/elementary/elm_grid.c +++ b/src/lib/elementary/elm_grid.c @@ -17,7 +17,7 @@ static void _elm_grid_efl_ui_focus_composition_prepare(Eo *obj, void *pd EINA_UNUSED) { - Elm_Widget_Smart_Data *wpd = efl_data_scope_get(obj, ELM_WIDGET_CLASS); + Elm_Widget_Smart_Data *wpd = efl_data_scope_get(obj, EFL_UI_WIDGET_CLASS); Eina_List *order = evas_object_grid_children_get(wpd->resize_obj); efl_ui_focus_composition_elements_set(obj, order); @@ -32,7 +32,7 @@ _mirrored_set(Evas_Object *obj, Eina_Bool rtl) } EOLIAN static Efl_Ui_Theme_Apply -_elm_grid_elm_widget_theme_apply(Eo *obj, void *sd EINA_UNUSED) +_elm_grid_efl_ui_widget_theme_apply(Eo *obj, void *sd EINA_UNUSED) { Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; diff --git a/src/lib/elementary/elm_grid.eo b/src/lib/elementary/elm_grid.eo index 8e50dafe7b..b8e685fb0a 100644 --- a/src/lib/elementary/elm_grid.eo +++ b/src/lib/elementary/elm_grid.eo @@ -1,4 +1,4 @@ -class Elm.Grid (Elm.Widget, Efl.Ui.Focus.Composition) +class Elm.Grid (Efl.Ui.Widget, Efl.Ui.Focus.Composition) { [[Elementary grid class]] legacy_prefix: elm_grid; @@ -55,7 +55,7 @@ class Elm.Grid (Elm.Widget, Efl.Ui.Focus.Composition) implements { class.constructor; Efl.Object.constructor; - Elm.Widget.theme_apply; + Efl.Ui.Widget.theme_apply; Efl.Ui.Focus.Composition.prepare; } } diff --git a/src/lib/elementary/elm_hover.c b/src/lib/elementary/elm_hover.c index e11cf76e53..1204277b7b 100644 --- a/src/lib/elementary/elm_hover.c +++ b/src/lib/elementary/elm_hover.c @@ -298,7 +298,7 @@ _hov_show_do(Evas_Object *obj) } EOLIAN static Efl_Ui_Theme_Apply -_elm_hover_elm_widget_theme_apply(Eo *obj, Elm_Hover_Data *sd) +_elm_hover_efl_ui_widget_theme_apply(Eo *obj, Elm_Hover_Data *sd) { Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); @@ -361,7 +361,7 @@ _on_smt_sub_changed(void *data, } EOLIAN static Eina_Bool -_elm_hover_elm_widget_widget_sub_object_add(Eo *obj, Elm_Hover_Data *sd, Evas_Object *sobj) +_elm_hover_efl_ui_widget_widget_sub_object_add(Eo *obj, Elm_Hover_Data *sd, Evas_Object *sobj) { Eina_Bool int_ret = EINA_FALSE; @@ -378,7 +378,7 @@ _elm_hover_elm_widget_widget_sub_object_add(Eo *obj, Elm_Hover_Data *sd, Evas_Ob } EOLIAN static Eina_Bool -_elm_hover_elm_widget_widget_sub_object_del(Eo *obj, Elm_Hover_Data *sd, Evas_Object *sobj) +_elm_hover_efl_ui_widget_widget_sub_object_del(Eo *obj, Elm_Hover_Data *sd, Evas_Object *sobj) { Eina_Bool int_ret = EINA_FALSE; @@ -751,7 +751,7 @@ elm_hover_parent_set(Evas_Object *obj, } EOLIAN static void -_elm_hover_elm_widget_widget_parent_set(Eo *obj, Elm_Hover_Data *sd, Evas_Object *parent) +_elm_hover_efl_ui_widget_widget_parent_set(Eo *obj, Elm_Hover_Data *sd, Evas_Object *parent) { _elm_hover_parent_detach(obj); @@ -787,7 +787,7 @@ elm_hover_parent_get(const Evas_Object *obj) } EOLIAN static Evas_Object* -_elm_hover_elm_widget_widget_parent_get(Eo *obj EINA_UNUSED, Elm_Hover_Data *sd) +_elm_hover_efl_ui_widget_widget_parent_get(Eo *obj EINA_UNUSED, Elm_Hover_Data *sd) { return sd->parent; } diff --git a/src/lib/elementary/elm_hover.eo b/src/lib/elementary/elm_hover.eo index c517b9c0a8..874bae2dc8 100644 --- a/src/lib/elementary/elm_hover.eo +++ b/src/lib/elementary/elm_hover.eo @@ -64,10 +64,10 @@ class Elm.Hover (Efl.Ui.Layout, Efl.Ui.Focus.Layer, Efl.Ui.Clickable, Efl.Access Efl.Gfx.visible { set; } Efl.Gfx.position { set; } Efl.Gfx.size { set; } - Elm.Widget.theme_apply; - Elm.Widget.widget_sub_object_add; - Elm.Widget.widget_parent { get; set; } - Elm.Widget.widget_sub_object_del; + Efl.Ui.Widget.theme_apply; + Efl.Ui.Widget.widget_sub_object_add; + Efl.Ui.Widget.widget_parent { get; set; } + Efl.Ui.Widget.widget_sub_object_del; Efl.Access.Widget.Action.elm_actions { get; } Efl.Access.state_set { get; } Efl.Part.part; diff --git a/src/lib/elementary/elm_hoversel.eo b/src/lib/elementary/elm_hoversel.eo index bc6447f46d..8e7a580716 100644 --- a/src/lib/elementary/elm_hoversel.eo +++ b/src/lib/elementary/elm_hoversel.eo @@ -95,10 +95,10 @@ class Elm.Hoversel (Efl.Ui.Button, Efl.Ui.Selectable, Efl.Object.constructor; Efl.Object.destructor; Efl.Gfx.visible { set; } - Elm.Widget.widget_parent { set; } - Elm.Widget.theme_apply; + Efl.Ui.Widget.widget_parent { set; } + Efl.Ui.Widget.theme_apply; Efl.Ui.Translatable.translation_update; - Elm.Widget.widget_event; + Efl.Ui.Widget.widget_event; Efl.Ui.Autorepeat.autorepeat_supported { get; } Efl.Access.Widget.Action.elm_actions { get; } Efl.Access.children { get; } diff --git a/src/lib/elementary/elm_icon.c b/src/lib/elementary/elm_icon.c index 1db6b6f87b..39e889192d 100644 --- a/src/lib/elementary/elm_icon.c +++ b/src/lib/elementary/elm_icon.c @@ -364,7 +364,7 @@ _elm_icon_efl_file_file_set(Eo *obj, Elm_Icon_Data *sd, const char *file, const } EOLIAN static Efl_Ui_Theme_Apply -_elm_icon_elm_widget_theme_apply(Eo *obj, Elm_Icon_Data *sd) +_elm_icon_efl_ui_widget_theme_apply(Eo *obj, Elm_Icon_Data *sd) { Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; diff --git a/src/lib/elementary/elm_icon.eo b/src/lib/elementary/elm_icon.eo index 529720141b..a49143691c 100644 --- a/src/lib/elementary/elm_icon.eo +++ b/src/lib/elementary/elm_icon.eo @@ -9,7 +9,7 @@ class Elm.Icon (Efl.Ui.Image) implements { class.constructor; Efl.Object.constructor; - Elm.Widget.theme_apply; + Efl.Ui.Widget.theme_apply; Efl.File.file { set; } } events { diff --git a/src/lib/elementary/elm_index.c b/src/lib/elementary/elm_index.c index bb33e027ab..51b4806be1 100644 --- a/src/lib/elementary/elm_index.c +++ b/src/lib/elementary/elm_index.c @@ -433,7 +433,7 @@ _index_priority_change(void *data, Elm_Index_Item_Data *it) } EOLIAN static Efl_Ui_Theme_Apply -_elm_index_elm_widget_theme_apply(Eo *obj, Elm_Index_Data *sd) +_elm_index_efl_ui_widget_theme_apply(Eo *obj, Elm_Index_Data *sd) { Evas_Coord minw = 0, minh = 0; Elm_Object_Item *eo_item; @@ -1178,7 +1178,7 @@ _access_obj_process(Evas_Object *obj, Eina_Bool is_access) } EOLIAN static void -_elm_index_elm_widget_on_access_update(Eo *obj, Elm_Index_Data *_pd EINA_UNUSED, Eina_Bool acs) +_elm_index_efl_ui_widget_on_access_update(Eo *obj, Elm_Index_Data *_pd EINA_UNUSED, Eina_Bool acs) { _elm_index_smart_focus_next_enable = acs; _access_obj_process(obj, _elm_index_smart_focus_next_enable); diff --git a/src/lib/elementary/elm_index.eo b/src/lib/elementary/elm_index.eo index 3dce6e8b2c..bdde52b480 100644 --- a/src/lib/elementary/elm_index.eo +++ b/src/lib/elementary/elm_index.eo @@ -197,8 +197,8 @@ class Elm.Index (Efl.Ui.Layout, Efl.Ui.Direction, implements { class.constructor; Efl.Object.constructor; - Elm.Widget.theme_apply; - Elm.Widget.on_access_update; + Efl.Ui.Widget.theme_apply; + Efl.Ui.Widget.on_access_update; Efl.Ui.Direction.direction { get; set; [[Only supports $vertical and $horizontal. Default is $vertical.]] } Efl.Access.children { get; } } diff --git a/src/lib/elementary/elm_interface_scrollable.c b/src/lib/elementary/elm_interface_scrollable.c index 071dc458d8..63d1405664 100644 --- a/src/lib/elementary/elm_interface_scrollable.c +++ b/src/lib/elementary/elm_interface_scrollable.c @@ -2946,7 +2946,7 @@ _elm_widget_parents_bounce_get(Eo *obj, Eina_Bool *horiz, Eina_Bool *vert) do { parent_obj = elm_widget_parent_get(parent_obj); - if ((!parent_obj) || (!efl_isa(parent_obj, ELM_WIDGET_CLASS))) break; + if ((!parent_obj) || (!efl_isa(parent_obj, EFL_UI_WIDGET_CLASS))) break; if (efl_isa(parent_obj, ELM_INTERFACE_SCROLLABLE_MIXIN)) { @@ -4663,7 +4663,7 @@ EAPI void elm_pan_gravity_set(Elm_Pan *obj EINA_UNUSED, double x EINA_UNUSED, do EAPI void elm_pan_gravity_get(const Elm_Pan *obj EINA_UNUSED, double *x EINA_UNUSED, double *y EINA_UNUSED) {} EOLIAN static Efl_Ui_Focus_Manager* -_elm_interface_scrollable_elm_widget_focus_manager_create(Eo *obj EINA_UNUSED, Elm_Scrollable_Smart_Interface_Data *pd EINA_UNUSED, Efl_Ui_Focus_Object *root) +_elm_interface_scrollable_efl_ui_widget_focus_manager_create(Eo *obj EINA_UNUSED, Elm_Scrollable_Smart_Interface_Data *pd EINA_UNUSED, Efl_Ui_Focus_Object *root) { Efl_Ui_Focus_Manager *manager; diff --git a/src/lib/elementary/elm_interface_scrollable.eo b/src/lib/elementary/elm_interface_scrollable.eo index 889efa214b..4748035e26 100644 --- a/src/lib/elementary/elm_interface_scrollable.eo +++ b/src/lib/elementary/elm_interface_scrollable.eo @@ -29,7 +29,7 @@ enum Elm.Scroller.Single_Direction last [[Sentinel value to indicate last enum field during iteration]] } -mixin Elm.Interface_Scrollable(Efl.Ui.Scrollable, Efl.Ui.Focus.Manager.Sub, Elm.Widget) +mixin Elm.Interface_Scrollable(Efl.Ui.Scrollable, Efl.Ui.Focus.Manager.Sub, Efl.Ui.Widget) { [[Elm scrollable mixin]] eo_prefix: elm_interface_scrollable; @@ -669,7 +669,7 @@ mixin Elm.Interface_Scrollable(Efl.Ui.Scrollable, Efl.Ui.Focus.Manager.Sub, Elm. class.constructor; Efl.Object.constructor; Efl.Ui.Focus.Manager.border_elements { get; } - Elm.Widget.focus_manager_create; + Efl.Ui.Widget.focus_manager_create; } events { changed; [[Called when content changed]] diff --git a/src/lib/elementary/elm_inwin.c b/src/lib/elementary/elm_inwin.c index 30647e7197..5c3d316ece 100644 --- a/src/lib/elementary/elm_inwin.c +++ b/src/lib/elementary/elm_inwin.c @@ -63,7 +63,7 @@ _elm_inwin_efl_canvas_group_group_add(Eo *obj, Elm_Inwin_Data *pd EINA_UNUSED) } EOLIAN static void -_elm_inwin_elm_widget_widget_parent_set(Eo *obj, Elm_Inwin_Data *pd EINA_UNUSED, Evas_Object *parent) +_elm_inwin_efl_ui_widget_widget_parent_set(Eo *obj, Elm_Inwin_Data *pd EINA_UNUSED, Evas_Object *parent) { elm_win_resize_object_add(parent, obj); diff --git a/src/lib/elementary/elm_inwin.eo b/src/lib/elementary/elm_inwin.eo index 6e867cf7c4..9edf1d65b1 100644 --- a/src/lib/elementary/elm_inwin.eo +++ b/src/lib/elementary/elm_inwin.eo @@ -21,7 +21,7 @@ class Elm.Inwin (Efl.Ui.Layout, Efl.Ui.Focus.Layer, Efl.Content) implements { class.constructor; Efl.Object.constructor; - Elm.Widget.widget_parent { set; } + Efl.Ui.Widget.widget_parent { set; } Efl.Content.content { get; set; } Efl.Content.content_unset; } diff --git a/src/lib/elementary/elm_label.c b/src/lib/elementary/elm_label.c index 8d493348ce..5708a74f69 100644 --- a/src/lib/elementary/elm_label.c +++ b/src/lib/elementary/elm_label.c @@ -182,7 +182,7 @@ _elm_label_horizontal_size_policy_update(Eo *obj, Elm_Label_Data *sd) } EOLIAN static Efl_Ui_Theme_Apply -_elm_label_elm_widget_theme_apply(Eo *obj, Elm_Label_Data *sd) +_elm_label_efl_ui_widget_theme_apply(Eo *obj, Elm_Label_Data *sd) { Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; diff --git a/src/lib/elementary/elm_label.eo b/src/lib/elementary/elm_label.eo index d273399847..8211153e21 100644 --- a/src/lib/elementary/elm_label.eo +++ b/src/lib/elementary/elm_label.eo @@ -124,7 +124,7 @@ class Elm.Label (Efl.Ui.Layout) implements { class.constructor; Efl.Object.constructor; - Elm.Widget.theme_apply; + Efl.Ui.Widget.theme_apply; Efl.Part.part; } events { diff --git a/src/lib/elementary/elm_list.c b/src/lib/elementary/elm_list.c index 9a5631c76e..b1346298d2 100644 --- a/src/lib/elementary/elm_list.c +++ b/src/lib/elementary/elm_list.c @@ -358,7 +358,7 @@ _item_focused_next(Evas_Object *obj, Elm_Focus_Direction dir) } static Eina_Bool -_elm_list_elm_widget_event_direction(Evas_Object *obj, Elm_Focus_Direction dir, Eina_Bool multi) +_elm_list_efl_ui_widget_event_direction(Evas_Object *obj, Elm_Focus_Direction dir, Eina_Bool multi) { Elm_Object_Item *eo_it = NULL; ELM_LIST_DATA_GET(obj, sd); @@ -486,56 +486,56 @@ static Eina_Bool _key_action_move(Evas_Object *obj, const char *params) /* TODO: fix logic for horizontal mode */ if (!strcmp(dir, "left")) { - if (_elm_list_elm_widget_event_direction(obj, ELM_FOCUS_LEFT, EINA_FALSE)) + if (_elm_list_efl_ui_widget_event_direction(obj, ELM_FOCUS_LEFT, EINA_FALSE)) return EINA_TRUE; else return EINA_FALSE; } else if (!strcmp(dir, "left_multi")) { - if (_elm_list_elm_widget_event_direction(obj, ELM_FOCUS_LEFT, EINA_TRUE)) + if (_elm_list_efl_ui_widget_event_direction(obj, ELM_FOCUS_LEFT, EINA_TRUE)) return EINA_TRUE; else return EINA_FALSE; } else if (!strcmp(dir, "right")) { - if (_elm_list_elm_widget_event_direction(obj, ELM_FOCUS_RIGHT, EINA_FALSE)) + if (_elm_list_efl_ui_widget_event_direction(obj, ELM_FOCUS_RIGHT, EINA_FALSE)) return EINA_TRUE; else return EINA_FALSE; } else if (!strcmp(dir, "right_multi")) { - if (_elm_list_elm_widget_event_direction(obj, ELM_FOCUS_RIGHT, EINA_TRUE)) + if (_elm_list_efl_ui_widget_event_direction(obj, ELM_FOCUS_RIGHT, EINA_TRUE)) return EINA_TRUE; else return EINA_FALSE; } else if (!strcmp(dir, "up")) { - if (_elm_list_elm_widget_event_direction(obj, ELM_FOCUS_UP, EINA_FALSE)) + if (_elm_list_efl_ui_widget_event_direction(obj, ELM_FOCUS_UP, EINA_FALSE)) return EINA_TRUE; else return EINA_FALSE; } else if (!strcmp(dir, "up_multi")) { - if (_elm_list_elm_widget_event_direction(obj, ELM_FOCUS_UP, EINA_TRUE)) + if (_elm_list_efl_ui_widget_event_direction(obj, ELM_FOCUS_UP, EINA_TRUE)) return EINA_TRUE; else return EINA_FALSE; } else if (!strcmp(dir, "down")) { - if (_elm_list_elm_widget_event_direction(obj, ELM_FOCUS_DOWN, EINA_FALSE)) + if (_elm_list_efl_ui_widget_event_direction(obj, ELM_FOCUS_DOWN, EINA_FALSE)) return EINA_TRUE; else return EINA_FALSE; } else if (!strcmp(dir, "down_multi")) { - if (_elm_list_elm_widget_event_direction(obj, ELM_FOCUS_DOWN, EINA_TRUE)) + if (_elm_list_efl_ui_widget_event_direction(obj, ELM_FOCUS_DOWN, EINA_TRUE)) return EINA_TRUE; else return EINA_FALSE; @@ -1033,7 +1033,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) +_elm_list_efl_ui_widget_on_disabled_update(Eo *obj, Elm_List_Data *sd, Eina_Bool disabled) { if (!efl_ui_widget_on_disabled_update(efl_super(obj, MY_CLASS), disabled)) return EINA_FALSE; @@ -1074,7 +1074,7 @@ _mirrored_set(Evas_Object *obj, } EOLIAN static Efl_Ui_Theme_Apply -_elm_list_elm_widget_theme_apply(Eo *obj, Elm_List_Data *sd) +_elm_list_efl_ui_widget_theme_apply(Eo *obj, Elm_List_Data *sd) { Elm_Object_Item *eo_it; Eina_List *n; @@ -1236,7 +1236,7 @@ _elm_list_nearest_visible_item_get(Evas_Object *obj, Elm_List_Item_Data *it) } EOLIAN static Eina_Bool -_elm_list_elm_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, Elm_Object_Item *item EINA_UNUSED) { Eina_Bool int_ret = EINA_FALSE; Elm_Object_Item *eo_it = NULL; @@ -1288,7 +1288,7 @@ _elm_list_elm_widget_on_focus_update(Eo *obj, Elm_List_Data *sd, Elm_Object_Item } EOLIAN static Eina_Bool -_elm_list_elm_widget_widget_sub_object_del(Eo *obj, Elm_List_Data *sd, Evas_Object *sobj) +_elm_list_efl_ui_widget_widget_sub_object_del(Eo *obj, Elm_List_Data *sd, Evas_Object *sobj) { const Eina_List *l; Elm_Object_Item *eo_it; @@ -2488,7 +2488,7 @@ _elm_list_efl_canvas_group_group_member_add(Eo *obj, Elm_List_Data *sd, Evas_Obj } EOLIAN static void -_elm_list_elm_widget_on_access_update(Eo *obj EINA_UNUSED, Elm_List_Data *sd, Eina_Bool acs) +_elm_list_efl_ui_widget_on_access_update(Eo *obj EINA_UNUSED, Elm_List_Data *sd, Eina_Bool acs) { Eina_List *elist = NULL; Elm_Object_Item *eo_it; @@ -3077,7 +3077,7 @@ _elm_list_item_coordinates_adjust(Elm_List_Item_Data *it) } EOLIAN static Eina_Rect -_elm_list_elm_widget_focus_highlight_geometry_get(Eo *obj EINA_UNUSED, Elm_List_Data *sd) +_elm_list_efl_ui_widget_focus_highlight_geometry_get(Eo *obj EINA_UNUSED, Elm_List_Data *sd) { Eina_Rect r = {}; @@ -3092,7 +3092,7 @@ _elm_list_elm_widget_focus_highlight_geometry_get(Eo *obj EINA_UNUSED, Elm_List_ } EOLIAN static Elm_Object_Item* -_elm_list_elm_widget_focused_item_get(Eo *obj EINA_UNUSED, Elm_List_Data *sd) +_elm_list_efl_ui_widget_focused_item_get(Eo *obj EINA_UNUSED, Elm_List_Data *sd) { return sd->focused_item; } diff --git a/src/lib/elementary/elm_list.eo b/src/lib/elementary/elm_list.eo index 9b1e970f69..fa2a335d44 100644 --- a/src/lib/elementary/elm_list.eo +++ b/src/lib/elementary/elm_list.eo @@ -433,15 +433,15 @@ class Elm.List (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Gfx.position { set; } Efl.Gfx.size { set; } Efl.Canvas.Group.group_member_add; - Elm.Widget.theme_apply; - Elm.Widget.on_access_update; - Elm.Widget.focus_highlight_geometry { get; } - Elm.Widget.on_disabled_update; - Elm.Widget.on_focus_update; + Efl.Ui.Widget.theme_apply; + 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.Translatable.translation_update; - Elm.Widget.widget_sub_object_del; - Elm.Widget.widget_event; - Elm.Widget.focused_item { get; } + Efl.Ui.Widget.widget_sub_object_del; + Efl.Ui.Widget.widget_event; + Efl.Ui.Widget.focused_item { get; } Elm.Interface_Scrollable.item_loop_enabled { get; set; } Elm.Interface_Scrollable.policy { set; } Efl.Access.Widget.Action.elm_actions { get; } diff --git a/src/lib/elementary/elm_main.c b/src/lib/elementary/elm_main.c index b75d8a820a..ebaef80d68 100644 --- a/src/lib/elementary/elm_main.c +++ b/src/lib/elementary/elm_main.c @@ -1712,7 +1712,7 @@ EAPI void elm_object_focus_next(Evas_Object *obj, Elm_Focus_Direction dir) { - Elm_Widget *top = elm_object_top_widget_get(obj); + Efl_Ui_Widget *top = elm_object_top_widget_get(obj); EINA_SAFETY_ON_NULL_RETURN(obj); efl_ui_focus_manager_move(top, dir); @@ -1722,7 +1722,7 @@ EAPI Evas_Object * elm_object_focus_next_object_get(const Evas_Object *obj, Elm_Focus_Direction dir) { - Elm_Widget *top = elm_object_top_widget_get(obj); + Efl_Ui_Widget *top = elm_object_top_widget_get(obj); EINA_SAFETY_ON_NULL_RETURN_VAL(obj, NULL); return efl_ui_focus_manager_request_move(top, dir); diff --git a/src/lib/elementary/elm_map.c b/src/lib/elementary/elm_map.c index 13b5521b96..cf16ed6142 100644 --- a/src/lib/elementary/elm_map.c +++ b/src/lib/elementary/elm_map.c @@ -3945,7 +3945,7 @@ _elm_map_pan_efl_gfx_position_set(Eo *obj, Elm_Map_Pan_Data *_pd EINA_UNUSED, Ei } EOLIAN static Eina_Bool -_elm_map_elm_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_Object_Item *item EINA_UNUSED) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); Eina_Bool int_ret = EINA_FALSE; @@ -3985,7 +3985,7 @@ _elm_map_pan_class_constructor(Efl_Class *klass) #include "elm_map_pan.eo.c" EOLIAN static Efl_Ui_Theme_Apply -_elm_map_elm_widget_theme_apply(Eo *obj, Elm_Map_Data *sd EINA_UNUSED) +_elm_map_efl_ui_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; diff --git a/src/lib/elementary/elm_map.eo b/src/lib/elementary/elm_map.eo index 0862ce606c..0e1c982b64 100644 --- a/src/lib/elementary/elm_map.eo +++ b/src/lib/elementary/elm_map.eo @@ -69,7 +69,7 @@ enum Elm.Map.Route_Method } -class Elm.Map (Elm.Widget, Elm.Interface_Scrollable, +class Elm.Map (Efl.Ui.Widget, Elm.Interface_Scrollable, Efl.Access.Widget.Action, Efl.Ui.Clickable) { @@ -630,9 +630,9 @@ class Elm.Map (Elm.Widget, Elm.Interface_Scrollable, Efl.Gfx.position { set; } Efl.Gfx.size { set; } Efl.Canvas.Group.group_member_add; - Elm.Widget.theme_apply; - Elm.Widget.on_focus_update; - Elm.Widget.widget_event; + Efl.Ui.Widget.theme_apply; + Efl.Ui.Widget.on_focus_update; + Efl.Ui.Widget.widget_event; Efl.Access.Widget.Action.elm_actions { get; } } events { diff --git a/src/lib/elementary/elm_mapbuf.c b/src/lib/elementary/elm_mapbuf.c index 97ab0d3259..36a824c679 100644 --- a/src/lib/elementary/elm_mapbuf.c +++ b/src/lib/elementary/elm_mapbuf.c @@ -36,7 +36,7 @@ _sizing_eval(Evas_Object *obj) } EOLIAN static Efl_Ui_Theme_Apply -_elm_mapbuf_elm_widget_theme_apply(Eo *obj, Elm_Mapbuf_Data *sd EINA_UNUSED) +_elm_mapbuf_efl_ui_widget_theme_apply(Eo *obj, Elm_Mapbuf_Data *sd EINA_UNUSED) { Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); @@ -75,7 +75,7 @@ _elm_mapbuf_content_unset_internal(Elm_Mapbuf_Data *sd, Evas_Object *obj, } EOLIAN static Eina_Bool -_elm_mapbuf_elm_widget_widget_sub_object_del(Eo *obj, Elm_Mapbuf_Data *sd, Evas_Object *sobj) +_elm_mapbuf_efl_ui_widget_widget_sub_object_del(Eo *obj, Elm_Mapbuf_Data *sd, Evas_Object *sobj) { Eina_Bool int_ret = EINA_FALSE; int_ret = elm_widget_sub_object_del(efl_super(obj, MY_CLASS), sobj); diff --git a/src/lib/elementary/elm_mapbuf.eo b/src/lib/elementary/elm_mapbuf.eo index 1ac1d3544c..a8f1eadea6 100644 --- a/src/lib/elementary/elm_mapbuf.eo +++ b/src/lib/elementary/elm_mapbuf.eo @@ -1,4 +1,4 @@ -class Elm.Mapbuf (Elm.Widget, Efl.Content, Efl.Part) +class Elm.Mapbuf (Efl.Ui.Widget, Efl.Content, Efl.Part) { [[Elementary mapbuf class]] legacy_prefix: elm_mapbuf; @@ -119,8 +119,8 @@ class Elm.Mapbuf (Elm.Widget, Efl.Content, Efl.Part) Efl.Gfx.visible { set; } Efl.Gfx.position { set; } Efl.Gfx.size { set; } - Elm.Widget.theme_apply; - Elm.Widget.widget_sub_object_del; + Efl.Ui.Widget.theme_apply; + Efl.Ui.Widget.widget_sub_object_del; Efl.Content.content { get; set; } Efl.Content.content_unset; Efl.Part.part; diff --git a/src/lib/elementary/elm_menu.c b/src/lib/elementary/elm_menu.c index 92ef38dfca..0e2bd3b1e6 100644 --- a/src/lib/elementary/elm_menu.c +++ b/src/lib/elementary/elm_menu.c @@ -219,7 +219,7 @@ _sizing_eval(Evas_Object *obj) evas_object_size_hint_max_set(sd->location, bw, h_p); elm_hover_target_set(sd->hv, sd->location); - hover = efl_data_scope_get(sd->hv, ELM_WIDGET_CLASS); + hover = efl_data_scope_get(sd->hv, EFL_UI_WIDGET_CLASS); edje_object_part_geometry_get(hover->resize_obj, "bottom", NULL, NULL, &bw, &bh); evas_object_size_hint_min_set(obj, bw, bh); @@ -232,7 +232,7 @@ _sizing_eval(Evas_Object *obj) } EOLIAN static Efl_Ui_Theme_Apply -_elm_menu_elm_widget_theme_apply(Eo *obj, Elm_Menu_Data *sd) +_elm_menu_efl_ui_widget_theme_apply(Eo *obj, Elm_Menu_Data *sd) { Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; @@ -804,7 +804,7 @@ elm_menu_add(Evas_Object *parent) } EOLIAN static Efl_Ui_Focus_Manager* -_elm_menu_elm_widget_focus_manager_create(Eo *obj EINA_UNUSED, Elm_Menu_Data *pd EINA_UNUSED, Efl_Ui_Focus_Object *root) +_elm_menu_efl_ui_widget_focus_manager_create(Eo *obj EINA_UNUSED, Elm_Menu_Data *pd EINA_UNUSED, Efl_Ui_Focus_Object *root) { Efl_Ui_Focus_Manager *manager; @@ -867,7 +867,7 @@ elm_menu_parent_set(Evas_Object *obj, } EOLIAN static void -_elm_menu_elm_widget_widget_parent_set(Eo *obj, Elm_Menu_Data *sd, Evas_Object *parent) +_elm_menu_efl_ui_widget_widget_parent_set(Eo *obj, Elm_Menu_Data *sd, Evas_Object *parent) { Eina_List *l, *_l, *_ll, *ll = NULL; Elm_Object_Item *eo_item; @@ -975,7 +975,7 @@ elm_menu_item_next_get(const Evas_Object *obj) } EOLIAN static Evas_Object* -_elm_menu_elm_widget_widget_parent_get(Eo *obj EINA_UNUSED, Elm_Menu_Data *sd) +_elm_menu_efl_ui_widget_widget_parent_get(Eo *obj EINA_UNUSED, Elm_Menu_Data *sd) { return sd->parent; } diff --git a/src/lib/elementary/elm_menu.eo b/src/lib/elementary/elm_menu.eo index 322557c910..ccbaa21500 100644 --- a/src/lib/elementary/elm_menu.eo +++ b/src/lib/elementary/elm_menu.eo @@ -1,4 +1,4 @@ -class Elm.Menu (Elm.Widget, Efl.Ui.Clickable, Efl.Ui.Menu, +class Elm.Menu (Efl.Ui.Widget, Efl.Ui.Clickable, Efl.Ui.Menu, Efl.Access.Selection, Efl.Ui.Focus.Manager) { [[Elementary menu class]] @@ -57,10 +57,10 @@ class Elm.Menu (Elm.Widget, Efl.Ui.Clickable, Efl.Ui.Menu, Efl.Object.constructor; Efl.Object.destructor; Efl.Gfx.visible { set; } - Elm.Widget.widget_parent { get; set; } - Elm.Widget.theme_apply; + Efl.Ui.Widget.widget_parent { get; set; } + Efl.Ui.Widget.theme_apply; Efl.Ui.Translatable.translation_update; - Elm.Widget.focus_manager_create; + Efl.Ui.Widget.focus_manager_create; Efl.Access.children { get; } Efl.Access.Selection.selected_children_count { get; } Efl.Access.Selection.selected_child { get; } diff --git a/src/lib/elementary/elm_naviframe.eo b/src/lib/elementary/elm_naviframe.eo index 0cb644f274..4f6c7bf457 100644 --- a/src/lib/elementary/elm_naviframe.eo +++ b/src/lib/elementary/elm_naviframe.eo @@ -144,13 +144,13 @@ class Elm.Naviframe (Efl.Ui.Layout, Efl.Access.Widget.Action) class.constructor; Efl.Object.constructor; Efl.Gfx.visible { set; } - Elm.Widget.on_access_update; + Efl.Ui.Widget.on_access_update; Efl.Ui.Translatable.translation_update; - Elm.Widget.theme_apply; - Elm.Widget.widget_event; + Efl.Ui.Widget.theme_apply; + Efl.Ui.Widget.widget_event; Efl.Layout.Signal.signal_emit; Efl.Access.Widget.Action.elm_actions { get; } - Elm.Widget.resize_object { set; } + Efl.Ui.Widget.resize_object { set; } Efl.Part.part; } events { diff --git a/src/lib/elementary/elm_notify.c b/src/lib/elementary/elm_notify.c index 9e6572abfd..232837bf38 100644 --- a/src/lib/elementary/elm_notify.c +++ b/src/lib/elementary/elm_notify.c @@ -141,7 +141,7 @@ _sizing_eval(Evas_Object *obj) } EOLIAN static Efl_Ui_Theme_Apply -_elm_notify_elm_widget_theme_apply(Eo *obj, Elm_Notify_Data *sd) +_elm_notify_efl_ui_widget_theme_apply(Eo *obj, Elm_Notify_Data *sd) { Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); @@ -201,7 +201,7 @@ _changed_size_hints_cb(void *data, } EOLIAN static Eina_Bool -_elm_notify_elm_widget_widget_sub_object_del(Eo *obj, Elm_Notify_Data *sd, Evas_Object *sobj) +_elm_notify_efl_ui_widget_widget_sub_object_del(Eo *obj, Elm_Notify_Data *sd, Evas_Object *sobj) { Eina_Bool int_ret = EINA_FALSE; int_ret = elm_widget_sub_object_del(efl_super(obj, MY_CLASS), sobj); @@ -493,7 +493,7 @@ elm_notify_parent_set(Evas_Object *obj, } EOLIAN static void -_elm_notify_elm_widget_widget_parent_set(Eo *obj, Elm_Notify_Data *sd, Evas_Object *parent) +_elm_notify_efl_ui_widget_widget_parent_set(Eo *obj, Elm_Notify_Data *sd, Evas_Object *parent) { if (sd->parent) { @@ -540,7 +540,7 @@ elm_notify_parent_get(const Evas_Object *obj) } EOLIAN static Evas_Object* -_elm_notify_elm_widget_widget_parent_get(Eo *obj EINA_UNUSED, Elm_Notify_Data *sd) +_elm_notify_efl_ui_widget_widget_parent_get(Eo *obj EINA_UNUSED, Elm_Notify_Data *sd) { return sd->parent; } diff --git a/src/lib/elementary/elm_notify.eo b/src/lib/elementary/elm_notify.eo index 2a71c1b855..a3a0afcf7f 100644 --- a/src/lib/elementary/elm_notify.eo +++ b/src/lib/elementary/elm_notify.eo @@ -1,4 +1,4 @@ -class Elm.Notify (Elm.Widget, Efl.Ui.Focus.Layer, Efl.Content, Efl.Part) +class Elm.Notify (Efl.Ui.Widget, Efl.Ui.Focus.Layer, Efl.Content, Efl.Part) { [[Elementary notification class]] legacy_prefix: elm_notify; @@ -83,9 +83,9 @@ class Elm.Notify (Elm.Widget, Efl.Ui.Focus.Layer, Efl.Content, Efl.Part) Efl.Gfx.visible { set; } Efl.Gfx.position { set; } Efl.Gfx.size { set; } - Elm.Widget.widget_parent { get; set; } - Elm.Widget.theme_apply; - Elm.Widget.widget_sub_object_del; + Efl.Ui.Widget.widget_parent { get; set; } + Efl.Ui.Widget.theme_apply; + Efl.Ui.Widget.widget_sub_object_del; Efl.Content.content { get; set; } Efl.Content.content_unset; Efl.Part.part; diff --git a/src/lib/elementary/elm_panel.c b/src/lib/elementary/elm_panel.c index 4b7b1a1144..79057b72d1 100644 --- a/src/lib/elementary/elm_panel.c +++ b/src/lib/elementary/elm_panel.c @@ -49,7 +49,7 @@ _mirrored_set(Evas_Object *obj, { ELM_PANEL_DATA_GET(obj, sd); - if ((sd->content) && (efl_isa(sd->content, ELM_WIDGET_CLASS))) + if ((sd->content) && (efl_isa(sd->content, EFL_UI_WIDGET_CLASS))) efl_ui_mirrored_set(sd->content, rtl); elm_panel_orient_set(obj, elm_panel_orient_get(obj)); } @@ -214,7 +214,7 @@ _scrollable_layout_theme_set(Eo *obj, Elm_Panel_Data *sd) } EOLIAN static Efl_Ui_Theme_Apply -_elm_panel_elm_widget_theme_apply(Eo *obj, Elm_Panel_Data *sd) +_elm_panel_efl_ui_widget_theme_apply(Eo *obj, Elm_Panel_Data *sd) { const char *str; Evas_Coord minw = 0, minh = 0; @@ -703,10 +703,10 @@ _key_action_toggle(Evas_Object *obj, const char *params EINA_UNUSED) ELM_WIDGET_KEY_DOWN_DEFAULT_IMPLEMENT(panel, Elm_Panel_Data) EOLIAN static Eina_Bool -_elm_panel_elm_widget_widget_event(Eo *obj, Elm_Panel_Data *pd, const Efl_Event *eo_event, Evas_Object *src) +_elm_panel_efl_ui_widget_widget_event(Eo *obj, Elm_Panel_Data *pd, const Efl_Event *eo_event, Evas_Object *src) { if (src != obj) return EINA_FALSE; - return _panel_elm_widget_widget_event(obj, pd, eo_event, src); + return _panel_efl_ui_widget_widget_event(obj, pd, eo_event, src); } static Eina_Bool @@ -932,7 +932,7 @@ _elm_panel_efl_canvas_group_group_member_add(Eo *obj, Elm_Panel_Data *sd, Evas_O } EOLIAN static void -_elm_panel_elm_widget_on_access_update(Eo *obj, Elm_Panel_Data *_pd, Eina_Bool is_access) +_elm_panel_efl_ui_widget_on_access_update(Eo *obj, Elm_Panel_Data *_pd, Eina_Bool is_access) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); Elm_Panel_Data *sd = _pd; @@ -1050,7 +1050,7 @@ _elm_panel_toggle(Eo *obj, Elm_Panel_Data *_pd EINA_UNUSED) } EOLIAN static Eina_Rect -_elm_panel_elm_widget_interest_region_get(Eo *obj, Elm_Panel_Data *sd) +_elm_panel_efl_ui_widget_interest_region_get(Eo *obj, Elm_Panel_Data *sd) { Eina_Rect r = {}; @@ -1220,7 +1220,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) +_elm_panel_efl_ui_widget_on_disabled_update(Eo *obj, Elm_Panel_Data *sd, Eina_Bool disabled) { if (!efl_ui_widget_on_disabled_update(efl_super(obj, MY_CLASS), disabled)) return EINA_FALSE; diff --git a/src/lib/elementary/elm_panel.eo b/src/lib/elementary/elm_panel.eo index 107b1aeba6..6a8f6f9e3f 100644 --- a/src/lib/elementary/elm_panel.eo +++ b/src/lib/elementary/elm_panel.eo @@ -79,11 +79,11 @@ class Elm.Panel (Efl.Ui.Layout, Efl.Ui.Focus.Layer, Elm.Interface_Scrollable, Efl.Gfx.position { set; } Efl.Gfx.size { set; } Efl.Canvas.Group.group_member_add; - Elm.Widget.theme_apply; - Elm.Widget.on_disabled_update; - Elm.Widget.on_access_update; - Elm.Widget.widget_event; - Elm.Widget.interest_region { get; } + Efl.Ui.Widget.theme_apply; + Efl.Ui.Widget.on_disabled_update; + Efl.Ui.Widget.on_access_update; + Efl.Ui.Widget.widget_event; + Efl.Ui.Widget.interest_region { get; } Efl.Access.Widget.Action.elm_actions { get; } Efl.Part.part; } diff --git a/src/lib/elementary/elm_part_helper.h b/src/lib/elementary/elm_part_helper.h index 3177aae7b9..29b08a68d6 100644 --- a/src/lib/elementary/elm_part_helper.h +++ b/src/lib/elementary/elm_part_helper.h @@ -24,13 +24,13 @@ struct _Elm_Part_Data static const char * _ ## type ## _default_content_part_get(const Eo *obj EINA_UNUSED, void *sd EINA_UNUSED) { return part; } #define ELM_PART_CONTENT_DEFAULT_OPS(type) \ - EFL_OBJECT_OP_FUNC(elm_widget_default_content_part_get, _ ## type ## _default_content_part_get) + EFL_OBJECT_OP_FUNC(efl_ui_widget_default_content_part_get, _ ## type ## _default_content_part_get) #define ELM_PART_TEXT_DEFAULT_GET(type, part) \ static const char * _ ## type ## _default_text_part_get(const Eo *obj EINA_UNUSED, void *sd EINA_UNUSED) { return part; } #define ELM_PART_TEXT_DEFAULT_OPS(type) \ - EFL_OBJECT_OP_FUNC(elm_widget_default_text_part_get, _ ## type ## _default_text_part_get) + EFL_OBJECT_OP_FUNC(efl_ui_widget_default_text_part_get, _ ## type ## _default_text_part_get) #define ELM_PART_CONTENT_DEFAULT_IMPLEMENT(type, typedata) \ EOLIAN static Eina_Bool \ diff --git a/src/lib/elementary/elm_photo.c b/src/lib/elementary/elm_photo.c index 531cc0c5e7..6934f0d2c6 100644 --- a/src/lib/elementary/elm_photo.c +++ b/src/lib/elementary/elm_photo.c @@ -50,7 +50,7 @@ _sizing_eval(Evas_Object *obj) } EOLIAN static Efl_Ui_Theme_Apply -_elm_photo_elm_widget_theme_apply(Eo *obj, Elm_Photo_Data *sd) +_elm_photo_efl_ui_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); diff --git a/src/lib/elementary/elm_photo.eo b/src/lib/elementary/elm_photo.eo index aa68685d1e..a7811ab123 100644 --- a/src/lib/elementary/elm_photo.eo +++ b/src/lib/elementary/elm_photo.eo @@ -1,4 +1,4 @@ -class Elm.Photo (Elm.Widget, Efl.File, Efl.Ui.Clickable, Efl.Ui.Draggable) +class Elm.Photo (Efl.Ui.Widget, Efl.File, Efl.Ui.Clickable, Efl.Ui.Draggable) { [[Elementary photo class]] legacy_prefix: elm_photo; @@ -7,6 +7,6 @@ class Elm.Photo (Elm.Widget, Efl.File, Efl.Ui.Clickable, Efl.Ui.Draggable) class.constructor; Efl.Object.constructor; Efl.File.file { set; } - Elm.Widget.theme_apply; + Efl.Ui.Widget.theme_apply; } } diff --git a/src/lib/elementary/elm_player.eo b/src/lib/elementary/elm_player.eo index bb2d95bb24..3771e08db9 100644 --- a/src/lib/elementary/elm_player.eo +++ b/src/lib/elementary/elm_player.eo @@ -7,8 +7,8 @@ class Elm.Player (Efl.Ui.Layout, Efl.Access.Widget.Action) implements { class.constructor; Efl.Object.constructor; - Elm.Widget.theme_apply; - Elm.Widget.widget_event; + Efl.Ui.Widget.theme_apply; + Efl.Ui.Widget.widget_event; Efl.Access.Widget.Action.elm_actions { get; } Efl.Part.part; } diff --git a/src/lib/elementary/elm_plug.c b/src/lib/elementary/elm_plug.c index 62bb83b90c..1a4df955fe 100644 --- a/src/lib/elementary/elm_plug.c +++ b/src/lib/elementary/elm_plug.c @@ -59,7 +59,7 @@ _elm_plug_resized(Ecore_Evas *ee) } EOLIAN static Eina_Bool -_elm_plug_elm_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, Elm_Object_Item *item EINA_UNUSED) { Eina_Bool int_ret = EINA_FALSE; @@ -81,7 +81,7 @@ _elm_plug_elm_widget_on_focus_update(Eo *obj, void *sd EINA_UNUSED, Elm_Object_I } EOLIAN static Efl_Ui_Theme_Apply -_elm_plug_elm_widget_theme_apply(Eo *obj, void *sd EINA_UNUSED) +_elm_plug_efl_ui_widget_theme_apply(Eo *obj, void *sd EINA_UNUSED) { Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); diff --git a/src/lib/elementary/elm_plug.eo b/src/lib/elementary/elm_plug.eo index f1e4d292a1..05020e04a3 100644 --- a/src/lib/elementary/elm_plug.eo +++ b/src/lib/elementary/elm_plug.eo @@ -1,4 +1,4 @@ -class Elm.Plug (Elm.Widget, Efl.Ui.Clickable) +class Elm.Plug (Efl.Ui.Widget, Efl.Ui.Clickable) { [[Elementary plug class]] legacy_prefix: elm_plug; @@ -33,8 +33,8 @@ class Elm.Plug (Elm.Widget, Efl.Ui.Clickable) implements { class.constructor; Efl.Object.constructor; - Elm.Widget.theme_apply; - Elm.Widget.on_focus_update; + Efl.Ui.Widget.theme_apply; + Efl.Ui.Widget.on_focus_update; } events { image,deleted; [[Called when image was deleted]] diff --git a/src/lib/elementary/elm_popup.eo b/src/lib/elementary/elm_popup.eo index 347624894f..f611d915cd 100644 --- a/src/lib/elementary/elm_popup.eo +++ b/src/lib/elementary/elm_popup.eo @@ -168,12 +168,12 @@ class Elm.Popup (Efl.Ui.Layout, Efl.Access.Widget.Action) implements { class.constructor; Efl.Object.constructor; - Elm.Widget.theme_apply; - Elm.Widget.on_access_update; - Elm.Widget.widget_parent { set; } + Efl.Ui.Widget.theme_apply; + Efl.Ui.Widget.on_access_update; + Efl.Ui.Widget.widget_parent { set; } Efl.Ui.Translatable.translation_update; - Elm.Widget.widget_sub_object_del; - Elm.Widget.widget_event; + Efl.Ui.Widget.widget_sub_object_del; + Efl.Ui.Widget.widget_event; Efl.Layout.Signal.signal_emit; Efl.Access.Widget.Action.elm_actions { get; } Efl.Access.state_set { get; } diff --git a/src/lib/elementary/elm_prefs.eo b/src/lib/elementary/elm_prefs.eo index bfb0cf85dc..2b7eb661b5 100644 --- a/src/lib/elementary/elm_prefs.eo +++ b/src/lib/elementary/elm_prefs.eo @@ -3,7 +3,7 @@ import eina_types; type Elm_Prefs_Data: __undefined_type; [[Elementary preferences data type]] type Elm_Prefs_Reset_Mode: __undefined_type; [[Elementary preferences reset mode type]] -class Elm.Prefs (Elm.Widget, Efl.File) +class Elm.Prefs (Efl.Ui.Widget, Efl.File) { [[Elementary preferences class]] legacy_prefix: elm_prefs; diff --git a/src/lib/elementary/elm_priv.h b/src/lib/elementary/elm_priv.h index a3e15c1ea6..862b56f6df 100644 --- a/src/lib/elementary/elm_priv.h +++ b/src/lib/elementary/elm_priv.h @@ -801,7 +801,7 @@ const Elm_Layout_Part_Alias_Description *elm_layout_text_aliases_get(const Eo *o # define ELM_WIDGET_KEY_DOWN_DEFAULT_IMPLEMENT(_pfx, _typ) \ EOLIAN static Eina_Bool \ -_##_pfx##_elm_widget_widget_event(Eo *obj, _typ *_pd EINA_UNUSED, const Efl_Event *eo_event, Evas_Object *src EINA_UNUSED) \ +_##_pfx##_efl_ui_widget_widget_event(Eo *obj, _typ *_pd EINA_UNUSED, const Efl_Event *eo_event, Evas_Object *src EINA_UNUSED) \ { \ Evas_Event_Key_Down *ev; \ if (eo_event->desc != EFL_EVENT_KEY_DOWN) return EINA_FALSE; \ diff --git a/src/lib/elementary/elm_route.c b/src/lib/elementary/elm_route.c index ba4f64e15f..9b1abd7ff3 100644 --- a/src/lib/elementary/elm_route.c +++ b/src/lib/elementary/elm_route.c @@ -87,7 +87,7 @@ _move_resize_cb(void *data EINA_UNUSED, } EOLIAN static Efl_Ui_Theme_Apply -_elm_route_elm_widget_theme_apply(Eo *obj, Elm_Route_Data *sd EINA_UNUSED) +_elm_route_efl_ui_widget_theme_apply(Eo *obj, Elm_Route_Data *sd EINA_UNUSED) { Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); diff --git a/src/lib/elementary/elm_route.eo b/src/lib/elementary/elm_route.eo index 52340054fa..fa95398c67 100644 --- a/src/lib/elementary/elm_route.eo +++ b/src/lib/elementary/elm_route.eo @@ -1,4 +1,4 @@ -class Elm.Route (Elm.Widget) +class Elm.Route (Efl.Ui.Widget) { [[Elementary route class]] legacy_prefix: elm_route; @@ -42,6 +42,6 @@ class Elm.Route (Elm.Widget) implements { class.constructor; Efl.Object.constructor; - Elm.Widget.theme_apply; + Efl.Ui.Widget.theme_apply; } } diff --git a/src/lib/elementary/elm_scroller.c b/src/lib/elementary/elm_scroller.c index 08b2dd17cb..6e5f9c5a13 100644 --- a/src/lib/elementary/elm_scroller.c +++ b/src/lib/elementary/elm_scroller.c @@ -262,7 +262,7 @@ _key_action_move(Evas_Object *obj, const char *params) } EOLIAN static Eina_Bool -_elm_scroller_elm_widget_on_access_activate(Eo *obj, Elm_Scroller_Data *_pd EINA_UNUSED, Efl_Ui_Activate act) +_elm_scroller_efl_ui_widget_on_access_activate(Eo *obj, Elm_Scroller_Data *_pd EINA_UNUSED, Efl_Ui_Activate act) { Evas_Coord x = 0; Evas_Coord y = 0; @@ -388,7 +388,7 @@ _mirrored_set(Evas_Object *obj, } EOLIAN static Efl_Ui_Theme_Apply -_elm_scroller_elm_widget_theme_apply(Eo *obj, Elm_Scroller_Data *sd EINA_UNUSED) +_elm_scroller_efl_ui_widget_theme_apply(Eo *obj, Elm_Scroller_Data *sd EINA_UNUSED) { Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); @@ -417,7 +417,7 @@ _changed_size_hints_cb(void *data, } EOLIAN static Eina_Bool -_elm_scroller_elm_widget_widget_sub_object_del(Eo *obj, Elm_Scroller_Data *sd, Evas_Object *sobj) +_elm_scroller_efl_ui_widget_widget_sub_object_del(Eo *obj, Elm_Scroller_Data *sd, Evas_Object *sobj) { Eina_Bool int_ret = EINA_FALSE; int_ret = elm_widget_sub_object_del(efl_super(obj, MY_CLASS), sobj); @@ -1336,7 +1336,7 @@ _elm_scroller_class_constructor(Efl_Class *klass) } EOLIAN static Eina_Bool -_elm_scroller_elm_widget_focus_state_apply(Eo *obj, Elm_Scroller_Data *pd EINA_UNUSED, Efl_Ui_Widget_Focus_State current_state, Efl_Ui_Widget_Focus_State *configured_state, Elm_Widget *redirect EINA_UNUSED) +_elm_scroller_efl_ui_widget_focus_state_apply(Eo *obj, Elm_Scroller_Data *pd EINA_UNUSED, Efl_Ui_Widget_Focus_State current_state, Efl_Ui_Widget_Focus_State *configured_state, Efl_Ui_Widget *redirect EINA_UNUSED) { //undepended from logical or not we always reigster as full with ourself as redirect configured_state->logical = EINA_TRUE; diff --git a/src/lib/elementary/elm_scroller.eo b/src/lib/elementary/elm_scroller.eo index 378f3c8c72..cb0e3fe177 100644 --- a/src/lib/elementary/elm_scroller.eo +++ b/src/lib/elementary/elm_scroller.eo @@ -47,16 +47,16 @@ class Elm.Scroller (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Canvas.Group.group_member_add; Efl.Content.content { get; set; } Efl.Content.content_unset; - Elm.Widget.theme_apply; - Elm.Widget.on_access_activate; - Elm.Widget.widget_sub_object_del; - Elm.Widget.widget_event; + Efl.Ui.Widget.theme_apply; + Efl.Ui.Widget.on_access_activate; + Efl.Ui.Widget.widget_sub_object_del; + Efl.Ui.Widget.widget_event; Elm.Interface_Scrollable.page_size { set; } Elm.Interface_Scrollable.policy { set; } Elm.Interface_Scrollable.single_direction { get; set; } Efl.Access.Widget.Action.elm_actions { get; } Efl.Part.part; - Elm.Widget.focus_state_apply; + Efl.Ui.Widget.focus_state_apply; } events { scroll,page,changed; [[Called when scroll page changed]] diff --git a/src/lib/elementary/elm_segment_control.c b/src/lib/elementary/elm_segment_control.c index 2c1099848e..31cecb00c3 100644 --- a/src/lib/elementary/elm_segment_control.c +++ b/src/lib/elementary/elm_segment_control.c @@ -217,7 +217,7 @@ _update_list(Elm_Segment_Control_Data *sd) } EOLIAN static Efl_Ui_Theme_Apply -_elm_segment_control_elm_widget_theme_apply(Eo *obj, Elm_Segment_Control_Data *sd) +_elm_segment_control_efl_ui_widget_theme_apply(Eo *obj, Elm_Segment_Control_Data *sd) { Eina_List *l; Eina_Bool rtl; @@ -246,7 +246,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) +_elm_segment_control_efl_ui_widget_on_disabled_update(Eo *obj, Elm_Segment_Control_Data *sd, Eina_Bool disabled) { if (!efl_ui_widget_on_disabled_update(efl_super(obj, MY_CLASS), disabled)) return EINA_FALSE; @@ -662,7 +662,7 @@ _access_obj_process(Elm_Segment_Control_Data *sd, Eina_Bool is_access) } EOLIAN static void -_elm_segment_control_elm_widget_on_access_update(Eo *obj EINA_UNUSED, Elm_Segment_Control_Data *sd, Eina_Bool acs) +_elm_segment_control_efl_ui_widget_on_access_update(Eo *obj EINA_UNUSED, Elm_Segment_Control_Data *sd, Eina_Bool acs) { _elm_segment_control_smart_focus_next_enable = acs; _access_obj_process(sd, _elm_segment_control_smart_focus_next_enable); diff --git a/src/lib/elementary/elm_segment_control.eo b/src/lib/elementary/elm_segment_control.eo index 834fe81965..7c2cbeaed6 100644 --- a/src/lib/elementary/elm_segment_control.eo +++ b/src/lib/elementary/elm_segment_control.eo @@ -136,9 +136,9 @@ class Elm.Segment_Control (Efl.Ui.Layout, Efl.Ui.Focus.Composition) implements { class.constructor; Efl.Object.constructor; - Elm.Widget.theme_apply; - Elm.Widget.on_access_update; - Elm.Widget.on_disabled_update; + Efl.Ui.Widget.theme_apply; + Efl.Ui.Widget.on_access_update; + Efl.Ui.Widget.on_disabled_update; Efl.Ui.Translatable.translation_update; } events { diff --git a/src/lib/elementary/elm_separator.c b/src/lib/elementary/elm_separator.c index 2f25d53ea6..cac415761f 100644 --- a/src/lib/elementary/elm_separator.c +++ b/src/lib/elementary/elm_separator.c @@ -17,7 +17,7 @@ #define MY_CLASS_NAME_LEGACY "elm_separator" EOLIAN static Efl_Ui_Theme_Apply -_elm_separator_elm_widget_theme_apply(Eo *obj, Elm_Separator_Data *sd EINA_UNUSED) +_elm_separator_efl_ui_widget_theme_apply(Eo *obj, Elm_Separator_Data *sd EINA_UNUSED) { Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; diff --git a/src/lib/elementary/elm_separator.eo b/src/lib/elementary/elm_separator.eo index 835f2e3085..3c7b23d369 100644 --- a/src/lib/elementary/elm_separator.eo +++ b/src/lib/elementary/elm_separator.eo @@ -19,6 +19,6 @@ class Elm.Separator (Efl.Ui.Layout) implements { class.constructor; Efl.Object.constructor; - Elm.Widget.theme_apply; + Efl.Ui.Widget.theme_apply; } } diff --git a/src/lib/elementary/elm_slideshow.eo b/src/lib/elementary/elm_slideshow.eo index 7436044040..9f0b533dfa 100644 --- a/src/lib/elementary/elm_slideshow.eo +++ b/src/lib/elementary/elm_slideshow.eo @@ -304,7 +304,7 @@ class Elm.Slideshow (Efl.Ui.Layout, Efl.Access.Widget.Action) implements { class.constructor; Efl.Object.constructor; - Elm.Widget.widget_event; + Efl.Ui.Widget.widget_event; Efl.Access.Widget.Action.elm_actions { get; } } events { diff --git a/src/lib/elementary/elm_spinner.c b/src/lib/elementary/elm_spinner.c index 3e809ef02b..c150d27eb5 100644 --- a/src/lib/elementary/elm_spinner.c +++ b/src/lib/elementary/elm_spinner.c @@ -737,7 +737,7 @@ _key_action_toggle(Evas_Object *obj, const char *params EINA_UNUSED) } EOLIAN static Eina_Bool -_elm_spinner_elm_widget_widget_event(Eo *obj, Elm_Spinner_Data *sd EINA_UNUSED, const Efl_Event *eo_event, Evas_Object *src EINA_UNUSED) +_elm_spinner_efl_ui_widget_widget_event(Eo *obj, Elm_Spinner_Data *sd EINA_UNUSED, const Efl_Event *eo_event, Evas_Object *src EINA_UNUSED) { Eo *ev = eo_event->info; @@ -930,7 +930,7 @@ _elm_spinner_elm_layout_sizing_eval(Eo *obj, Elm_Spinner_Data *_pd EINA_UNUSED) } EOLIAN static Eina_Bool -_elm_spinner_elm_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, Elm_Object_Item *item EINA_UNUSED) { Eina_Bool int_ret = EINA_FALSE; @@ -1289,7 +1289,7 @@ _elm_spinner_efl_canvas_group_group_del(Eo *obj, Elm_Spinner_Data *sd) } EOLIAN static Efl_Ui_Theme_Apply -_elm_spinner_elm_widget_theme_apply(Eo *obj, Elm_Spinner_Data *sd) +_elm_spinner_efl_ui_widget_theme_apply(Eo *obj, Elm_Spinner_Data *sd) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED); @@ -1346,7 +1346,7 @@ _elm_spinner_elm_widget_theme_apply(Eo *obj, Elm_Spinner_Data *sd) static Eina_Bool _elm_spinner_smart_focus_next_enable = EINA_FALSE; EOLIAN static void -_elm_spinner_elm_widget_on_access_update(Eo *obj, Elm_Spinner_Data *_pd EINA_UNUSED, Eina_Bool acs) +_elm_spinner_efl_ui_widget_on_access_update(Eo *obj, Elm_Spinner_Data *_pd EINA_UNUSED, Eina_Bool acs) { _elm_spinner_smart_focus_next_enable = acs; _access_spinner_register(obj, _elm_spinner_smart_focus_next_enable); diff --git a/src/lib/elementary/elm_spinner.eo b/src/lib/elementary/elm_spinner.eo index f1496108ad..5248eea6d8 100644 --- a/src/lib/elementary/elm_spinner.eo +++ b/src/lib/elementary/elm_spinner.eo @@ -170,10 +170,10 @@ class Elm.Spinner (Efl.Ui.Layout, Efl.Ui.Range, Efl.Ui.Focus.Composition, implements { class.constructor; Efl.Object.constructor; - Elm.Widget.theme_apply; - Elm.Widget.on_access_update; - Elm.Widget.on_focus_update; - Elm.Widget.widget_event; + Efl.Ui.Widget.theme_apply; + Efl.Ui.Widget.on_access_update; + Efl.Ui.Widget.on_focus_update; + Efl.Ui.Widget.widget_event; Efl.Ui.Range.range_min_max { get; set; } Efl.Ui.Range.range_step { get; set; } Efl.Ui.Range.range_value { get; set; } diff --git a/src/lib/elementary/elm_table.c b/src/lib/elementary/elm_table.c index ca3de608a5..df89976ee4 100644 --- a/src/lib/elementary/elm_table.c +++ b/src/lib/elementary/elm_table.c @@ -18,7 +18,7 @@ static void _elm_table_efl_ui_focus_composition_prepare(Eo *obj, void *pd EINA_UNUSED) { - Elm_Widget_Smart_Data *wpd = efl_data_scope_get(obj, ELM_WIDGET_CLASS); + Elm_Widget_Smart_Data *wpd = efl_data_scope_get(obj, EFL_UI_WIDGET_CLASS); Eina_List *order = evas_object_table_children_get(wpd->resize_obj); efl_ui_focus_composition_elements_set(obj, order); @@ -33,7 +33,7 @@ _mirrored_set(Evas_Object *obj, Eina_Bool rtl) } EOLIAN static Efl_Ui_Theme_Apply -_elm_table_elm_widget_theme_apply(Eo *obj, void *sd EINA_UNUSED) +_elm_table_efl_ui_widget_theme_apply(Eo *obj, void *sd EINA_UNUSED) { Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); @@ -65,7 +65,7 @@ _on_size_hints_changed(void *data, } EOLIAN static Eina_Bool -_elm_table_elm_widget_widget_sub_object_del(Eo *obj, void *_pd EINA_UNUSED, Evas_Object *child) +_elm_table_efl_ui_widget_widget_sub_object_del(Eo *obj, void *_pd EINA_UNUSED, Evas_Object *child) { Eina_Bool int_ret = EINA_FALSE; diff --git a/src/lib/elementary/elm_table.eo b/src/lib/elementary/elm_table.eo index 115d43c1c0..8271373212 100644 --- a/src/lib/elementary/elm_table.eo +++ b/src/lib/elementary/elm_table.eo @@ -1,4 +1,4 @@ -class Elm.Table (Elm.Widget, Efl.Ui.Focus.Composition) +class Elm.Table (Efl.Ui.Widget, Efl.Ui.Focus.Composition) { [[Elementary table class]] legacy_prefix: elm_table; @@ -121,8 +121,8 @@ class Elm.Table (Elm.Widget, Efl.Ui.Focus.Composition) class.constructor; Efl.Object.constructor; Efl.Canvas.Group.group_calculate; - Elm.Widget.theme_apply; - Elm.Widget.widget_sub_object_del; + Efl.Ui.Widget.theme_apply; + Efl.Ui.Widget.widget_sub_object_del; Efl.Ui.Focus.Composition.prepare; } } diff --git a/src/lib/elementary/elm_thumb.c b/src/lib/elementary/elm_thumb.c index 9819cc3ffe..22fa256d9e 100644 --- a/src/lib/elementary/elm_thumb.c +++ b/src/lib/elementary/elm_thumb.c @@ -287,7 +287,7 @@ _thumb_finish(Elm_Thumb_Data *sd, ELM_SAFE_FREE(sd->thumb.thumb_key, eina_stringshare_del); ELM_SAFE_FREE(sd->view, evas_object_del); - wd = efl_data_scope_get(sd->obj, ELM_WIDGET_CLASS); + wd = efl_data_scope_get(sd->obj, EFL_UI_WIDGET_CLASS); edje_object_signal_emit(wd->resize_obj, EDJE_SIGNAL_LOAD_ERROR, "elm"); efl_event_callback_legacy_call(sd->obj, ELM_THUMB_EVENT_LOAD_ERROR, NULL); } diff --git a/src/lib/elementary/elm_toolbar.c b/src/lib/elementary/elm_toolbar.c index aa86ec8e06..7d567bbf7b 100644 --- a/src/lib/elementary/elm_toolbar.c +++ b/src/lib/elementary/elm_toolbar.c @@ -746,7 +746,7 @@ _elm_toolbar_nearest_visible_item_get(Evas_Object *obj, Elm_Object_Item *eo_it) } EOLIAN static Eina_Bool -_elm_toolbar_elm_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_Object_Item *item EINA_UNUSED) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); Eina_Bool int_ret = EINA_FALSE; @@ -1462,7 +1462,7 @@ _elm_toolbar_highlight_in_theme(Evas_Object *obj) } EOLIAN static Efl_Ui_Theme_Apply -_elm_toolbar_elm_widget_theme_apply(Eo *obj, Elm_Toolbar_Data *sd) +_elm_toolbar_efl_ui_widget_theme_apply(Eo *obj, Elm_Toolbar_Data *sd) { Elm_Toolbar_Item_Data *it; double scale = 0; @@ -2883,7 +2883,7 @@ _access_obj_process(Elm_Toolbar_Data * sd, Eina_Bool is_access) } EOLIAN static void -_elm_toolbar_elm_widget_on_access_update(Eo *obj EINA_UNUSED, Elm_Toolbar_Data *sd, Eina_Bool acs) +_elm_toolbar_efl_ui_widget_on_access_update(Eo *obj EINA_UNUSED, Elm_Toolbar_Data *sd, Eina_Bool acs) { _elm_toolbar_smart_focus_next_enable = acs; _access_obj_process(sd, _elm_toolbar_smart_focus_next_enable); @@ -2929,7 +2929,7 @@ _elm_toolbar_item_efl_ui_focus_object_focus_set(Eo *obj, Elm_Toolbar_Item_Data * } EOLIAN static Eina_Rect -_elm_toolbar_elm_widget_focus_highlight_geometry_get(Eo *obj, Elm_Toolbar_Data *sd) +_elm_toolbar_efl_ui_widget_focus_highlight_geometry_get(Eo *obj, Elm_Toolbar_Data *sd) { Eina_Rect r = {}; @@ -2953,7 +2953,7 @@ elm_toolbar_add(Evas_Object *parent) } EOLIAN static Eina_Bool -_elm_toolbar_elm_widget_focus_state_apply(Eo *obj, Elm_Toolbar_Data *pd EINA_UNUSED, Efl_Ui_Widget_Focus_State current_state, Efl_Ui_Widget_Focus_State *configured_state, Elm_Widget *redirect EINA_UNUSED) +_elm_toolbar_efl_ui_widget_focus_state_apply(Eo *obj, Elm_Toolbar_Data *pd EINA_UNUSED, Efl_Ui_Widget_Focus_State current_state, Efl_Ui_Widget_Focus_State *configured_state, Efl_Ui_Widget *redirect EINA_UNUSED) { configured_state->logical = EINA_TRUE; return efl_ui_widget_focus_state_apply(efl_super(obj, MY_CLASS), current_state, configured_state, obj); @@ -3900,7 +3900,7 @@ _elm_toolbar_item_efl_access_state_set_get(Eo *eo_it, Elm_Toolbar_Item_Data *ite } EOLIAN static Elm_Object_Item * -_elm_toolbar_elm_widget_focused_item_get(Eo *obj EINA_UNUSED, Elm_Toolbar_Data *sd) +_elm_toolbar_efl_ui_widget_focused_item_get(Eo *obj EINA_UNUSED, Elm_Toolbar_Data *sd) { return sd->focused_item; } diff --git a/src/lib/elementary/elm_toolbar.eo b/src/lib/elementary/elm_toolbar.eo index 3198d61d02..e77c55f6b6 100644 --- a/src/lib/elementary/elm_toolbar.eo +++ b/src/lib/elementary/elm_toolbar.eo @@ -23,7 +23,7 @@ enum Elm.Toolbar.Shrink_Mode last [[Indicates error if returned by elm_toolbar_shrink_mode_get()]] } -class Elm.Toolbar (Elm.Widget, Efl.Ui.Focus.Composition, Elm.Interface_Scrollable, Efl.Ui.Direction, +class Elm.Toolbar (Efl.Ui.Widget, Efl.Ui.Focus.Composition, Elm.Interface_Scrollable, Efl.Ui.Direction, Efl.Access.Widget.Action, Efl.Access.Selection, Efl.Ui.Clickable, Efl.Ui.Selectable, Efl.Ui.Menu) { @@ -320,15 +320,15 @@ class Elm.Toolbar (Elm.Widget, Efl.Ui.Focus.Composition, Elm.Interface_Scrollabl Efl.Gfx.size { set; } Efl.Canvas.Group.group_calculate; Efl.Canvas.Group.group_member_add; - Elm.Widget.on_access_update; - Elm.Widget.theme_apply; - Elm.Widget.on_focus_update; + Efl.Ui.Widget.on_access_update; + Efl.Ui.Widget.theme_apply; + Efl.Ui.Widget.on_focus_update; Efl.Ui.Translatable.translation_update; - Elm.Widget.widget_event; - Elm.Widget.focus_highlight_geometry { get; } - Elm.Widget.focused_item { get; } + Efl.Ui.Widget.widget_event; + Efl.Ui.Widget.focus_highlight_geometry { get; } + Efl.Ui.Widget.focused_item { get; } Efl.Ui.Direction.direction { get; set; [[Only supports $vertical and $horizontal. Default is $horizontal.]] } - Elm.Widget.focus_state_apply; + Efl.Ui.Widget.focus_state_apply; Efl.Access.Widget.Action.elm_actions { get; } Efl.Access.children { get; } Efl.Access.state_set { get; } diff --git a/src/lib/elementary/elm_web.eo b/src/lib/elementary/elm_web.eo index db349fd100..1ff13fe350 100644 --- a/src/lib/elementary/elm_web.eo +++ b/src/lib/elementary/elm_web.eo @@ -14,7 +14,7 @@ enum Elm.Web.Zoom_Mode last [[Sentinel value to indicate last enum field during iteration]] } -class Elm.Web (Elm.Widget) +class Elm.Web (Efl.Ui.Widget) { [[Elementary web view class]] legacy_prefix: elm_web; diff --git a/src/lib/elementary/elm_widget.h b/src/lib/elementary/elm_widget.h index b7975a45da..a25cf236ac 100644 --- a/src/lib/elementary/elm_widget.h +++ b/src/lib/elementary/elm_widget.h @@ -316,7 +316,7 @@ typedef Eina_Bool (*Elm_Widget_Focus_Get_Cb)(const void *data); typedef void (*Elm_Access_On_Highlight_Cb)(void *data); typedef void * (*list_data_get_func_type)(const Eina_List * l); -#include "elm_widget.eo.h" +#include "efl_ui_widget.eo.h" /** * @addtogroup Widget @@ -474,7 +474,7 @@ typedef Elm_Widget_Smart_Data Efl_Ui_Widget_Data; * @} */ -/**< base structure for all widget items that are not Elm_Widget themselves */ +/**< base structure for all widget items that are not Efl_Ui_Widget themselves */ typedef struct _Elm_Widget_Item_Data Elm_Widget_Item_Data; typedef struct _Elm_Widget_Item_Signal_Data Elm_Widget_Item_Signal_Data; @@ -761,11 +761,11 @@ EAPI Eina_Bool _elm_widget_item_onscreen_is(Elm_Object_Item *item); const char* _elm_widget_accessible_plain_name_get(Evas_Object *obj, const char* name); const char* _elm_widget_item_accessible_plain_name_get(Elm_Object_Item *item, const char* name); -Efl_Canvas_Object * _efl_ui_widget_bg_get(Elm_Widget *obj); +Efl_Canvas_Object * _efl_ui_widget_bg_get(Efl_Ui_Widget *obj); #define ELM_WIDGET_DATA_GET_OR_RETURN(o, ptr, ...) \ Elm_Widget_Smart_Data *ptr; \ - ptr = efl_data_scope_get(o, ELM_WIDGET_CLASS); \ + ptr = efl_data_scope_get(o, EFL_UI_WIDGET_CLASS); \ if (EINA_UNLIKELY(!ptr)) \ { \ CRI("no widget data for object %p (%s)", \ @@ -774,7 +774,7 @@ Efl_Canvas_Object * _efl_ui_widget_bg_get(Elm_Widget *obj); } #define ELM_WIDGET_CHECK(obj) \ - if (EINA_UNLIKELY(!efl_isa((obj), ELM_WIDGET_CLASS))) \ + if (EINA_UNLIKELY(!efl_isa((obj), EFL_UI_WIDGET_CLASS))) \ return #define ELM_WIDGET_ITEM_RETURN_IF_ONDEL(item, ...) \ @@ -836,15 +836,15 @@ elm_widget_is_legacy(const Eo *obj) Elm_Widget_Smart_Data *sd; if (_elm_legacy_add) return EINA_TRUE; - sd = (Elm_Widget_Smart_Data *) efl_data_scope_safe_get(obj, ELM_WIDGET_CLASS); + sd = (Elm_Widget_Smart_Data *) efl_data_scope_safe_get(obj, EFL_UI_WIDGET_CLASS); return sd ? sd->legacy : EINA_FALSE; } /** Takes in any canvas object and returns the first smart parent that is a widget */ -static inline Elm_Widget * +static inline Efl_Ui_Widget * evas_object_widget_parent_find(Evas_Object *o) { - while (o && !efl_isa(o, ELM_WIDGET_CLASS)) + while (o && !efl_isa(o, EFL_UI_WIDGET_CLASS)) evas_object_smart_parent_get(o); return o; } @@ -860,8 +860,8 @@ EAPI Eina_Bool _elm_layout_part_aliasing_eval(const Evas_Object *obj, Eina_Bool is_text); /* Internal EO APIs */ -const char *elm_widget_default_content_part_get(const Eo *obj); -const char *elm_widget_default_text_part_get(const Eo *obj); +const char *efl_ui_widget_default_content_part_get(const Eo *obj); +const char *efl_ui_widget_default_text_part_get(const Eo *obj); #define ELM_WIDGET_ITEM_PROTECTED diff --git a/src/lib/elementary/els_cursor.c b/src/lib/elementary/els_cursor.c index a90c7daf25..8d15df1762 100644 --- a/src/lib/elementary/els_cursor.c +++ b/src/lib/elementary/els_cursor.c @@ -640,7 +640,7 @@ elm_object_sub_cursor_set(Evas_Object *eventarea, Evas_Object *owner, const char } EOLIAN Eina_Bool -_elm_widget_efl_ui_cursor_cursor_set(Evas_Object *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED, +_efl_ui_widget_efl_ui_cursor_cursor_set(Evas_Object *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED, const char *cursor) { EINA_SAFETY_ON_NULL_RETURN_VAL(obj, EINA_FALSE); @@ -649,7 +649,7 @@ _elm_widget_efl_ui_cursor_cursor_set(Evas_Object *obj, Elm_Widget_Smart_Data *pd } EOLIAN const char * -_elm_widget_efl_ui_cursor_cursor_get(const Evas_Object *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED) +_efl_ui_widget_efl_ui_cursor_cursor_get(const Evas_Object *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED) { ELM_CURSOR_GET_OR_RETURN(cur, obj, NULL); return cur->cursor_name; @@ -718,7 +718,7 @@ elm_object_cursor_unset(Evas_Object *obj) } EOLIAN Eina_Bool -_elm_widget_efl_ui_cursor_cursor_style_set(Evas_Object *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED, +_efl_ui_widget_efl_ui_cursor_cursor_style_set(Evas_Object *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED, const char *style) { ELM_CURSOR_GET_OR_RETURN(cur, obj, EINA_FALSE); @@ -754,7 +754,7 @@ _elm_widget_efl_ui_cursor_cursor_style_set(Evas_Object *obj, Elm_Widget_Smart_Da } EOLIAN const char * -_elm_widget_efl_ui_cursor_cursor_style_get(const Evas_Object *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED) +_efl_ui_widget_efl_ui_cursor_cursor_style_get(const Evas_Object *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED) { ELM_CURSOR_GET_OR_RETURN(cur, obj, NULL); return cur->style ? cur->style : "default"; @@ -776,8 +776,8 @@ elm_cursor_theme(Elm_Cursor *cur) } EOLIAN Eina_Bool -_elm_widget_efl_ui_cursor_cursor_theme_search_enabled_set(Evas_Object *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED, - Eina_Bool theme_search) +_efl_ui_widget_efl_ui_cursor_cursor_theme_search_enabled_set(Evas_Object *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED, + Eina_Bool theme_search) { ELM_CURSOR_GET_OR_RETURN(cur, obj, EINA_FALSE); cur->theme_search = theme_search; @@ -787,7 +787,7 @@ _elm_widget_efl_ui_cursor_cursor_theme_search_enabled_set(Evas_Object *obj, Elm_ } EOLIAN Eina_Bool -_elm_widget_efl_ui_cursor_cursor_theme_search_enabled_get(const Evas_Object *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED) +_efl_ui_widget_efl_ui_cursor_cursor_theme_search_enabled_get(const Evas_Object *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED) { ELM_CURSOR_GET_OR_RETURN(cur, obj, EINA_FALSE); return cur->theme_search; |