summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmitesh Singh <amitesh.sh@samsung.com>2018-01-08 13:55:35 +0900
committerAmitesh Singh <amitesh.sh@samsung.com>2018-01-08 21:28:10 +0900
commit44d3227beb8b2064aa98ddedc90b29b8e9580278 (patch)
treeffa9f6c39dac2eefe6b911c1c8af954716818b1d
parentade2c9ed520e20b7855b08df61077874e8d1d6c1 (diff)
widget: rename elm widget to Efl.Ui.Widget.
-rw-r--r--po/POTFILES.in2
-rw-r--r--src/Makefile_Elementary.am4
-rw-r--r--src/lib/elementary/Elementary.h2
-rw-r--r--src/lib/elementary/efl_access_widget_action.c2
-rw-r--r--src/lib/elementary/efl_ui_box.eo2
-rw-r--r--src/lib/elementary/efl_ui_button.c6
-rw-r--r--src/lib/elementary/efl_ui_button.eo8
-rw-r--r--src/lib/elementary/efl_ui_calendar.c6
-rw-r--r--src/lib/elementary/efl_ui_calendar.eo8
-rw-r--r--src/lib/elementary/efl_ui_check.c6
-rw-r--r--src/lib/elementary/efl_ui_check.eo8
-rw-r--r--src/lib/elementary/efl_ui_clock.c6
-rw-r--r--src/lib/elementary/efl_ui_clock.eo6
-rw-r--r--src/lib/elementary/efl_ui_flip.c12
-rw-r--r--src/lib/elementary/efl_ui_flip.eo8
-rw-r--r--src/lib/elementary/efl_ui_focus_composition.c6
-rw-r--r--src/lib/elementary/efl_ui_focus_composition.eo8
-rw-r--r--src/lib/elementary/efl_ui_focus_layer.c4
-rw-r--r--src/lib/elementary/efl_ui_focus_layer.eo6
-rw-r--r--src/lib/elementary/efl_ui_focus_parent_provider_gen.c8
-rw-r--r--src/lib/elementary/efl_ui_focus_parent_provider_gen.eo4
-rw-r--r--src/lib/elementary/efl_ui_focus_util.c2
-rw-r--r--src/lib/elementary/efl_ui_image.c2
-rw-r--r--src/lib/elementary/efl_ui_image.eo6
-rw-r--r--src/lib/elementary/efl_ui_image_zoomable.c4
-rw-r--r--src/lib/elementary/efl_ui_image_zoomable.eo8
-rw-r--r--src/lib/elementary/efl_ui_layout.c20
-rw-r--r--src/lib/elementary/efl_ui_layout.eo14
-rw-r--r--src/lib/elementary/efl_ui_list.c2
-rw-r--r--src/lib/elementary/efl_ui_list.eo4
-rw-r--r--src/lib/elementary/efl_ui_multibuttonentry.c10
-rw-r--r--src/lib/elementary/efl_ui_multibuttonentry.eo6
-rw-r--r--src/lib/elementary/efl_ui_nstate.c2
-rw-r--r--src/lib/elementary/efl_ui_nstate.eo4
-rw-r--r--src/lib/elementary/efl_ui_panes.c2
-rw-r--r--src/lib/elementary/efl_ui_panes.eo2
-rw-r--r--src/lib/elementary/efl_ui_popup.c2
-rw-r--r--src/lib/elementary/efl_ui_popup.eo2
-rw-r--r--src/lib/elementary/efl_ui_progressbar.c6
-rw-r--r--src/lib/elementary/efl_ui_progressbar.eo6
-rw-r--r--src/lib/elementary/efl_ui_radio.c4
-rw-r--r--src/lib/elementary/efl_ui_radio.eo6
-rw-r--r--src/lib/elementary/efl_ui_scroller.c2
-rw-r--r--src/lib/elementary/efl_ui_scroller.eo2
-rw-r--r--src/lib/elementary/efl_ui_slider.c12
-rw-r--r--src/lib/elementary/efl_ui_slider.eo8
-rw-r--r--src/lib/elementary/efl_ui_spin.c2
-rw-r--r--src/lib/elementary/efl_ui_spin.eo2
-rw-r--r--src/lib/elementary/efl_ui_spin_button.c6
-rw-r--r--src/lib/elementary/efl_ui_spin_button.eo6
-rw-r--r--src/lib/elementary/efl_ui_table.c2
-rw-r--r--src/lib/elementary/efl_ui_table.eo4
-rw-r--r--src/lib/elementary/efl_ui_text.c14
-rw-r--r--src/lib/elementary/efl_ui_text.eo12
-rw-r--r--src/lib/elementary/efl_ui_textpath.c2
-rw-r--r--src/lib/elementary/efl_ui_textpath.eo2
-rw-r--r--src/lib/elementary/efl_ui_video.eo2
-rw-r--r--src/lib/elementary/efl_ui_widget.c (renamed from src/lib/elementary/elm_widget.c)246
-rw-r--r--src/lib/elementary/efl_ui_widget.eo (renamed from src/lib/elementary/elm_widget.eo)18
-rw-r--r--src/lib/elementary/efl_ui_win.c20
-rw-r--r--src/lib/elementary/efl_ui_win.eo24
-rw-r--r--src/lib/elementary/elc_combobox.c2
-rw-r--r--src/lib/elementary/elc_ctxpopup.c15
-rw-r--r--src/lib/elementary/elc_fileselector.c4
-rw-r--r--src/lib/elementary/elc_fileselector_button.c2
-rw-r--r--src/lib/elementary/elc_fileselector_entry.c4
-rw-r--r--src/lib/elementary/elc_hoversel.c8
-rw-r--r--src/lib/elementary/elc_naviframe.c6
-rw-r--r--src/lib/elementary/elc_player.c2
-rw-r--r--src/lib/elementary/elc_popup.c8
-rw-r--r--src/lib/elementary/elementary_config.h4
-rw-r--r--src/lib/elementary/elm_access.c4
-rw-r--r--src/lib/elementary/elm_access.eo6
-rw-r--r--src/lib/elementary/elm_actionslider.c2
-rw-r--r--src/lib/elementary/elm_actionslider.eo2
-rw-r--r--src/lib/elementary/elm_box.c10
-rw-r--r--src/lib/elementary/elm_box.eo6
-rw-r--r--src/lib/elementary/elm_bubble.c2
-rw-r--r--src/lib/elementary/elm_bubble.eo2
-rw-r--r--src/lib/elementary/elm_calendar.c6
-rw-r--r--src/lib/elementary/elm_calendar.eo8
-rw-r--r--src/lib/elementary/elm_clock.c4
-rw-r--r--src/lib/elementary/elm_clock.eo4
-rw-r--r--src/lib/elementary/elm_code_widget.c8
-rw-r--r--src/lib/elementary/elm_code_widget.eo4
-rw-r--r--src/lib/elementary/elm_colorselector.c6
-rw-r--r--src/lib/elementary/elm_colorselector.eo8
-rw-r--r--src/lib/elementary/elm_combobox.eo4
-rw-r--r--src/lib/elementary/elm_conform.c4
-rw-r--r--src/lib/elementary/elm_conformant.eo4
-rw-r--r--src/lib/elementary/elm_ctxpopup.eo12
-rw-r--r--src/lib/elementary/elm_dayselector.c2
-rw-r--r--src/lib/elementary/elm_dayselector.eo2
-rw-r--r--src/lib/elementary/elm_diskselector.c8
-rw-r--r--src/lib/elementary/elm_diskselector.eo12
-rw-r--r--src/lib/elementary/elm_entry.c14
-rw-r--r--src/lib/elementary/elm_entry.eo12
-rw-r--r--src/lib/elementary/elm_fileselector.eo6
-rw-r--r--src/lib/elementary/elm_fileselector_button.eo2
-rw-r--r--src/lib/elementary/elm_fileselector_entry.eo4
-rw-r--r--src/lib/elementary/elm_flipselector.c2
-rw-r--r--src/lib/elementary/elm_flipselector.eo4
-rw-r--r--src/lib/elementary/elm_gengrid.c18
-rw-r--r--src/lib/elementary/elm_gengrid.eo14
-rw-r--r--src/lib/elementary/elm_genlist.c30
-rw-r--r--src/lib/elementary/elm_genlist.eo18
-rw-r--r--src/lib/elementary/elm_gesture_layer.c2
-rw-r--r--src/lib/elementary/elm_gesture_layer.eo4
-rw-r--r--src/lib/elementary/elm_glview.c2
-rw-r--r--src/lib/elementary/elm_glview.eo4
-rw-r--r--src/lib/elementary/elm_grid.c4
-rw-r--r--src/lib/elementary/elm_grid.eo4
-rw-r--r--src/lib/elementary/elm_hover.c10
-rw-r--r--src/lib/elementary/elm_hover.eo8
-rw-r--r--src/lib/elementary/elm_hoversel.eo6
-rw-r--r--src/lib/elementary/elm_icon.c2
-rw-r--r--src/lib/elementary/elm_icon.eo2
-rw-r--r--src/lib/elementary/elm_index.c4
-rw-r--r--src/lib/elementary/elm_index.eo4
-rw-r--r--src/lib/elementary/elm_interface_scrollable.c4
-rw-r--r--src/lib/elementary/elm_interface_scrollable.eo4
-rw-r--r--src/lib/elementary/elm_inwin.c2
-rw-r--r--src/lib/elementary/elm_inwin.eo2
-rw-r--r--src/lib/elementary/elm_label.c2
-rw-r--r--src/lib/elementary/elm_label.eo2
-rw-r--r--src/lib/elementary/elm_list.c32
-rw-r--r--src/lib/elementary/elm_list.eo16
-rw-r--r--src/lib/elementary/elm_main.c4
-rw-r--r--src/lib/elementary/elm_map.c4
-rw-r--r--src/lib/elementary/elm_map.eo8
-rw-r--r--src/lib/elementary/elm_mapbuf.c4
-rw-r--r--src/lib/elementary/elm_mapbuf.eo6
-rw-r--r--src/lib/elementary/elm_menu.c10
-rw-r--r--src/lib/elementary/elm_menu.eo8
-rw-r--r--src/lib/elementary/elm_naviframe.eo8
-rw-r--r--src/lib/elementary/elm_notify.c8
-rw-r--r--src/lib/elementary/elm_notify.eo8
-rw-r--r--src/lib/elementary/elm_panel.c14
-rw-r--r--src/lib/elementary/elm_panel.eo10
-rw-r--r--src/lib/elementary/elm_part_helper.h4
-rw-r--r--src/lib/elementary/elm_photo.c2
-rw-r--r--src/lib/elementary/elm_photo.eo4
-rw-r--r--src/lib/elementary/elm_player.eo4
-rw-r--r--src/lib/elementary/elm_plug.c4
-rw-r--r--src/lib/elementary/elm_plug.eo6
-rw-r--r--src/lib/elementary/elm_popup.eo10
-rw-r--r--src/lib/elementary/elm_prefs.eo2
-rw-r--r--src/lib/elementary/elm_priv.h2
-rw-r--r--src/lib/elementary/elm_route.c2
-rw-r--r--src/lib/elementary/elm_route.eo4
-rw-r--r--src/lib/elementary/elm_scroller.c8
-rw-r--r--src/lib/elementary/elm_scroller.eo10
-rw-r--r--src/lib/elementary/elm_segment_control.c6
-rw-r--r--src/lib/elementary/elm_segment_control.eo6
-rw-r--r--src/lib/elementary/elm_separator.c2
-rw-r--r--src/lib/elementary/elm_separator.eo2
-rw-r--r--src/lib/elementary/elm_slideshow.eo2
-rw-r--r--src/lib/elementary/elm_spinner.c8
-rw-r--r--src/lib/elementary/elm_spinner.eo8
-rw-r--r--src/lib/elementary/elm_table.c6
-rw-r--r--src/lib/elementary/elm_table.eo6
-rw-r--r--src/lib/elementary/elm_thumb.c2
-rw-r--r--src/lib/elementary/elm_toolbar.c12
-rw-r--r--src/lib/elementary/elm_toolbar.eo16
-rw-r--r--src/lib/elementary/elm_web.eo2
-rw-r--r--src/lib/elementary/elm_widget.h20
-rw-r--r--src/lib/elementary/els_cursor.c14
167 files changed, 659 insertions, 658 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 06b1e60..dfe0f71 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -174,7 +174,7 @@ src/lib/elementary/elm_transit.c
174src/lib/elementary/elm_util.c 174src/lib/elementary/elm_util.c
175src/lib/elementary/efl_ui_video.c 175src/lib/elementary/efl_ui_video.c
176src/lib/elementary/elm_web2.c 176src/lib/elementary/elm_web2.c
177src/lib/elementary/elm_widget.c 177src/lib/elementary/efl_ui_widget.c
178src/lib/elementary/efl_ui_win.c 178src/lib/elementary/efl_ui_win.c
179src/lib/elementary/els_box.c 179src/lib/elementary/els_box.c
180src/lib/elementary/els_cursor.c 180src/lib/elementary/els_cursor.c
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index 5b292a5..dffd96f 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -2,7 +2,7 @@
2### Library 2### Library
3 3
4elm_public_eolian_files = \ 4elm_public_eolian_files = \
5 lib/elementary/elm_widget.eo \ 5 lib/elementary/efl_ui_widget.eo \
6 lib/elementary/efl_ui_bg.eo \ 6 lib/elementary/efl_ui_bg.eo \
7 lib/elementary/efl_ui_bg_widget.eo \ 7 lib/elementary/efl_ui_bg_widget.eo \
8 lib/elementary/efl_ui_button.eo \ 8 lib/elementary/efl_ui_button.eo \
@@ -711,7 +711,7 @@ lib_elementary_libelementary_la_SOURCES = \
711 lib/elementary/elm_view_list.c \ 711 lib/elementary/elm_view_list.c \
712 lib/elementary/elm_view_form.c \ 712 lib/elementary/elm_view_form.c \
713 lib/elementary/elm_web2.c \ 713 lib/elementary/elm_web2.c \
714 lib/elementary/elm_widget.c \ 714 lib/elementary/efl_ui_widget.c \
715 lib/elementary/efl_ui_win.c \ 715 lib/elementary/efl_ui_win.c \
716 lib/elementary/efl_ui_win_inlined.c \ 716 lib/elementary/efl_ui_win_inlined.c \
717 lib/elementary/efl_ui_win_socket.c \ 717 lib/elementary/efl_ui_win_socket.c \
diff --git a/src/lib/elementary/Elementary.h b/src/lib/elementary/Elementary.h
index 57192ae..da2cc35 100644
--- a/src/lib/elementary/Elementary.h
+++ b/src/lib/elementary/Elementary.h
@@ -277,7 +277,7 @@ EAPI extern Elm_Version *elm_version;
277#ifdef EFL_EO_API_SUPPORT 277#ifdef EFL_EO_API_SUPPORT
278# include <efl_ui_list_segarray.h> 278# include <efl_ui_list_segarray.h>
279# include <efl_config_global.eo.h> 279# include <efl_config_global.eo.h>
280# include <elm_widget.eo.h> 280# include <efl_ui_widget.eo.h>
281# include <efl_ui_widget_part.eo.h> 281# include <efl_ui_widget_part.eo.h>
282# include <efl_ui_widget_part_bg.eo.h> 282# include <efl_ui_widget_part_bg.eo.h>
283# include <efl_ui_widget_part_shadow.eo.h> 283# 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 89836ed..a8bed05 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
49 Elm_Config_Binding_Key *binding; 49 Elm_Config_Binding_Key *binding;
50 int tmp = 0; 50 int tmp = 0;
51 51
52 if (!efl_isa(obj, ELM_WIDGET_CLASS)) 52 if (!efl_isa(obj, EFL_UI_WIDGET_CLASS))
53 return NULL; 53 return NULL;
54 54
55 actions = efl_access_widget_action_elm_actions_get(obj); 55 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 ac8834d..e0a0280 100644
--- a/src/lib/elementary/efl_ui_box.eo
+++ b/src/lib/elementary/efl_ui_box.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Box (Elm.Widget, Efl.Pack.Linear, Efl.Pack.Layout, 1class Efl.Ui.Box (Efl.Ui.Widget, Efl.Pack.Linear, Efl.Pack.Layout,
2 Efl.Ui.Direction) 2 Efl.Ui.Direction)
3{ 3{
4 [[The box widget. 4 [[The box widget.
diff --git a/src/lib/elementary/efl_ui_button.c b/src/lib/elementary/efl_ui_button.c
index e2b4d09..34dbd02 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
88} 88}
89 89
90EOLIAN static Eina_Bool 90EOLIAN static Eina_Bool
91_efl_ui_button_elm_widget_on_access_activate(Eo *obj, Efl_Ui_Button_Data *_pd EINA_UNUSED, Efl_Ui_Activate act) 91_efl_ui_button_efl_ui_widget_on_access_activate(Eo *obj, Efl_Ui_Button_Data *_pd EINA_UNUSED, Efl_Ui_Activate act)
92{ 92{
93 if (elm_widget_disabled_get(obj)) return EINA_FALSE; 93 if (elm_widget_disabled_get(obj)) return EINA_FALSE;
94 if (act != EFL_UI_ACTIVATE_DEFAULT) return EINA_FALSE; 94 if (act != EFL_UI_ACTIVATE_DEFAULT) return EINA_FALSE;
@@ -121,7 +121,7 @@ _icon_signal_emit(Evas_Object *obj)
121 * is elm.swallow.content, not elm.swallow.icon. Fix that whenever we 121 * is elm.swallow.content, not elm.swallow.icon. Fix that whenever we
122 * can changed the theme API */ 122 * can changed the theme API */
123EOLIAN static Efl_Ui_Theme_Apply 123EOLIAN static Efl_Ui_Theme_Apply
124_efl_ui_button_elm_widget_theme_apply(Eo *obj, Efl_Ui_Button_Data *_pd EINA_UNUSED) 124_efl_ui_button_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Button_Data *_pd EINA_UNUSED)
125{ 125{
126 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; 126 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
127 127
@@ -136,7 +136,7 @@ _efl_ui_button_elm_widget_theme_apply(Eo *obj, Efl_Ui_Button_Data *_pd EINA_UNUS
136 * is elm.swallow.content, not elm.swallow.icon. Fix that whenever we 136 * is elm.swallow.content, not elm.swallow.icon. Fix that whenever we
137 * can changed the theme API */ 137 * can changed the theme API */
138EOLIAN static Eina_Bool 138EOLIAN static Eina_Bool
139_efl_ui_button_elm_widget_widget_sub_object_del(Eo *obj, Efl_Ui_Button_Data *_pd EINA_UNUSED, Evas_Object *sobj) 139_efl_ui_button_efl_ui_widget_widget_sub_object_del(Eo *obj, Efl_Ui_Button_Data *_pd EINA_UNUSED, Evas_Object *sobj)
140{ 140{
141 Eina_Bool int_ret = EINA_FALSE; 141 Eina_Bool int_ret = EINA_FALSE;
142 142
diff --git a/src/lib/elementary/efl_ui_button.eo b/src/lib/elementary/efl_ui_button.eo
index 12b118a..cb165ed 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,
15 Efl.Ui.Autorepeat.autorepeat_gap_timeout { set; get; } 15 Efl.Ui.Autorepeat.autorepeat_gap_timeout { set; get; }
16 Efl.Ui.Autorepeat.autorepeat_enabled { set; get; } 16 Efl.Ui.Autorepeat.autorepeat_enabled { set; get; }
17 Efl.Ui.Autorepeat.autorepeat_supported { get;} 17 Efl.Ui.Autorepeat.autorepeat_supported { get;}
18 Elm.Widget.on_access_activate; 18 Efl.Ui.Widget.on_access_activate;
19 Elm.Widget.theme_apply; 19 Efl.Ui.Widget.theme_apply;
20 Elm.Widget.widget_sub_object_del; 20 Efl.Ui.Widget.widget_sub_object_del;
21 Elm.Widget.widget_event; 21 Efl.Ui.Widget.widget_event;
22 Efl.Access.Widget.Action.elm_actions { get; } 22 Efl.Access.Widget.Action.elm_actions { get; }
23 Efl.Part.part; 23 Efl.Part.part;
24 Efl.Content.content { get; set; } 24 Efl.Content.content { get; set; }
diff --git a/src/lib/elementary/efl_ui_calendar.c b/src/lib/elementary/efl_ui_calendar.c
index 492b588..2810eeb 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)
528} 528}
529 529
530EOLIAN static Efl_Ui_Theme_Apply 530EOLIAN static Efl_Ui_Theme_Apply
531_efl_ui_calendar_elm_widget_theme_apply(Eo *obj, Efl_Ui_Calendar_Data *sd) 531_efl_ui_calendar_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Calendar_Data *sd)
532{ 532{
533 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; 533 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
534 534
@@ -863,7 +863,7 @@ _key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED)
863} 863}
864 864
865EOLIAN static Eina_Bool 865EOLIAN static Eina_Bool
866_efl_ui_calendar_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Calendar_Data *sd, Elm_Object_Item *item EINA_UNUSED) 866_efl_ui_calendar_efl_ui_widget_on_focus_update(Eo *obj, Efl_Ui_Calendar_Data *sd, Elm_Object_Item *item EINA_UNUSED)
867{ 867{
868 Eina_Bool int_ret = EINA_FALSE; 868 Eina_Bool int_ret = EINA_FALSE;
869 869
@@ -957,7 +957,7 @@ _access_obj_process(Evas_Object *obj, Eina_Bool is_access)
957} 957}
958 958
959EOLIAN static void 959EOLIAN static void
960_efl_ui_calendar_elm_widget_on_access_update(Eo *obj EINA_UNUSED, Efl_Ui_Calendar_Data *_pd EINA_UNUSED, Eina_Bool acs) 960_efl_ui_calendar_efl_ui_widget_on_access_update(Eo *obj EINA_UNUSED, Efl_Ui_Calendar_Data *_pd EINA_UNUSED, Eina_Bool acs)
961{ 961{
962 _efl_ui_calendar_smart_focus_next_enable = acs; 962 _efl_ui_calendar_smart_focus_next_enable = acs;
963 _access_obj_process(obj, _efl_ui_calendar_smart_focus_next_enable); 963 _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 35ac4d9..088d2e1 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
106 Efl.Object.constructor; 106 Efl.Object.constructor;
107 Efl.Object.destructor; 107 Efl.Object.destructor;
108 Efl.Canvas.Group.group_calculate; 108 Efl.Canvas.Group.group_calculate;
109 Elm.Widget.theme_apply; 109 Efl.Ui.Widget.theme_apply;
110 Elm.Widget.on_access_update; 110 Efl.Ui.Widget.on_access_update;
111 Elm.Widget.on_focus_update; 111 Efl.Ui.Widget.on_focus_update;
112 Elm.Widget.widget_event; 112 Efl.Ui.Widget.widget_event;
113 Efl.Access.Widget.Action.elm_actions { get; } 113 Efl.Access.Widget.Action.elm_actions { get; }
114 Efl.Ui.Format.format_cb { set; } 114 Efl.Ui.Format.format_cb { set; }
115 } 115 }
diff --git a/src/lib/elementary/efl_ui_check.c b/src/lib/elementary/efl_ui_check.c
index fc4ff5c..f4917b3 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
117 * is elm.swallow.content, not elm.swallow.icon. Fix that whenever we 117 * is elm.swallow.content, not elm.swallow.icon. Fix that whenever we
118 * can changed the theme API */ 118 * can changed the theme API */
119EOLIAN static Eina_Bool 119EOLIAN static Eina_Bool
120_efl_ui_check_elm_widget_widget_sub_object_del(Eo *obj, Efl_Ui_Check_Data *_pd EINA_UNUSED, Evas_Object *sobj) 120_efl_ui_check_efl_ui_widget_widget_sub_object_del(Eo *obj, Efl_Ui_Check_Data *_pd EINA_UNUSED, Evas_Object *sobj)
121{ 121{
122 Eina_Bool int_ret = EINA_FALSE; 122 Eina_Bool int_ret = EINA_FALSE;
123 123
@@ -132,7 +132,7 @@ _efl_ui_check_elm_widget_widget_sub_object_del(Eo *obj, Efl_Ui_Check_Data *_pd E
132} 132}
133 133
134EOLIAN static Eina_Bool 134EOLIAN static Eina_Bool
135_efl_ui_check_elm_widget_on_access_activate(Eo *obj EINA_UNUSED, Efl_Ui_Check_Data *_pd EINA_UNUSED, Efl_Ui_Activate act) 135_efl_ui_check_efl_ui_widget_on_access_activate(Eo *obj EINA_UNUSED, Efl_Ui_Check_Data *_pd EINA_UNUSED, Efl_Ui_Activate act)
136{ 136{
137 if (elm_widget_disabled_get(obj)) return EINA_FALSE; 137 if (elm_widget_disabled_get(obj)) return EINA_FALSE;
138 if (act != EFL_UI_ACTIVATE_DEFAULT) return EINA_FALSE; 138 if (act != EFL_UI_ACTIVATE_DEFAULT) return EINA_FALSE;
@@ -150,7 +150,7 @@ _key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED)
150} 150}
151 151
152EOLIAN static Efl_Ui_Theme_Apply 152EOLIAN static Efl_Ui_Theme_Apply
153_efl_ui_check_elm_widget_theme_apply(Eo *obj, Efl_Ui_Check_Data *sd EINA_UNUSED) 153_efl_ui_check_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Check_Data *sd EINA_UNUSED)
154{ 154{
155 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; 155 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
156 156
diff --git a/src/lib/elementary/efl_ui_check.eo b/src/lib/elementary/efl_ui_check.eo
index 44d79d9..6544f39 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)
23 implements { 23 implements {
24 class.constructor; 24 class.constructor;
25 Efl.Object.constructor; 25 Efl.Object.constructor;
26 Elm.Widget.on_access_activate; 26 Efl.Ui.Widget.on_access_activate;
27 Elm.Widget.theme_apply; 27 Efl.Ui.Widget.theme_apply;
28 Elm.Widget.widget_sub_object_del; 28 Efl.Ui.Widget.widget_sub_object_del;
29 Elm.Widget.widget_event; 29 Efl.Ui.Widget.widget_event;
30 Efl.Ui.Nstate.count { set; } 30 Efl.Ui.Nstate.count { set; }
31 Efl.Ui.Nstate.value { set; } 31 Efl.Ui.Nstate.value { set; }
32 Efl.Access.state_set { get; } 32 Efl.Access.state_set { get; }
diff --git a/src/lib/elementary/efl_ui_clock.c b/src/lib/elementary/efl_ui_clock.c
index ac10a61..3fb6f77 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)
449} 449}
450 450
451EOLIAN static Eina_Bool 451EOLIAN static Eina_Bool
452_efl_ui_clock_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Clock_Data *sd, Elm_Object_Item *item EINA_UNUSED) 452_efl_ui_clock_efl_ui_widget_on_focus_update(Eo *obj, Efl_Ui_Clock_Data *sd, Elm_Object_Item *item EINA_UNUSED)
453{ 453{
454 Eina_Bool int_ret = EINA_FALSE; 454 Eina_Bool int_ret = EINA_FALSE;
455 455
@@ -466,7 +466,7 @@ _efl_ui_clock_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Clock_Data *sd, Elm_Obj
466} 466}
467 467
468EOLIAN static Eina_Bool 468EOLIAN static Eina_Bool
469_efl_ui_clock_elm_widget_on_disabled_update(Eo *obj, Efl_Ui_Clock_Data *sd, Eina_Bool disabled) 469_efl_ui_clock_efl_ui_widget_on_disabled_update(Eo *obj, Efl_Ui_Clock_Data *sd, Eina_Bool disabled)
470{ 470{
471 Clock_Field *field; 471 Clock_Field *field;
472 unsigned int idx = 0; 472 unsigned int idx = 0;
@@ -501,7 +501,7 @@ _efl_ui_clock_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Clock_Data *sd)
501} 501}
502 502
503EOLIAN static Efl_Ui_Theme_Apply 503EOLIAN static Efl_Ui_Theme_Apply
504_efl_ui_clock_elm_widget_theme_apply(Eo *obj, Efl_Ui_Clock_Data *sd) 504_efl_ui_clock_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Clock_Data *sd)
505{ 505{
506 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; 506 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
507 507
diff --git a/src/lib/elementary/efl_ui_clock.eo b/src/lib/elementary/efl_ui_clock.eo
index a18a0af..3211962 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)
224 implements { 224 implements {
225 class.constructor; 225 class.constructor;
226 Efl.Object.constructor; 226 Efl.Object.constructor;
227 Elm.Widget.theme_apply; 227 Efl.Ui.Widget.theme_apply;
228 Elm.Widget.on_disabled_update; 228 Efl.Ui.Widget.on_disabled_update;
229 Elm.Widget.on_focus_update; 229 Efl.Ui.Widget.on_focus_update;
230 Efl.Ui.Translatable.translation_update; 230 Efl.Ui.Translatable.translation_update;
231 } 231 }
232 events { 232 events {
diff --git a/src/lib/elementary/efl_ui_flip.c b/src/lib/elementary/efl_ui_flip.c
index 4fe9725..3967a3a 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)
98} 98}
99 99
100EOLIAN static Efl_Ui_Theme_Apply 100EOLIAN static Efl_Ui_Theme_Apply
101_efl_ui_flip_elm_widget_theme_apply(Eo *obj, Efl_Ui_Flip_Data *sd EINA_UNUSED) 101_efl_ui_flip_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Flip_Data *sd EINA_UNUSED)
102{ 102{
103 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; 103 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
104 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 104 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
@@ -119,7 +119,7 @@ _changed_size_hints_cb(void *data,
119} 119}
120 120
121EOLIAN static Eina_Bool 121EOLIAN static Eina_Bool
122_efl_ui_flip_elm_widget_widget_sub_object_add(Eo *obj, Efl_Ui_Flip_Data *_pd EINA_UNUSED, Evas_Object *sobj) 122_efl_ui_flip_efl_ui_widget_widget_sub_object_add(Eo *obj, Efl_Ui_Flip_Data *_pd EINA_UNUSED, Evas_Object *sobj)
123{ 123{
124 Eina_Bool int_ret = EINA_FALSE; 124 Eina_Bool int_ret = EINA_FALSE;
125 125
@@ -139,7 +139,7 @@ _efl_ui_flip_elm_widget_widget_sub_object_add(Eo *obj, Efl_Ui_Flip_Data *_pd EIN
139} 139}
140 140
141EOLIAN static Eina_Bool 141EOLIAN static Eina_Bool
142_efl_ui_flip_elm_widget_widget_sub_object_del(Eo *obj, Efl_Ui_Flip_Data *sd, Evas_Object *sobj) 142_efl_ui_flip_efl_ui_widget_widget_sub_object_del(Eo *obj, Efl_Ui_Flip_Data *sd, Evas_Object *sobj)
143{ 143{
144 Eina_Bool int_ret = EINA_FALSE; 144 Eina_Bool int_ret = EINA_FALSE;
145 145
@@ -1743,7 +1743,7 @@ _flip_content_set(Evas_Object *obj,
1743 //evas_object_smart_member_add(content, obj); 1743 //evas_object_smart_member_add(content, obj);
1744 evas_object_clip_set 1744 evas_object_clip_set
1745 (content, front ? sd->front.clip : sd->back.clip); 1745 (content, front ? sd->front.clip : sd->back.clip);
1746 if (efl_isa(content, ELM_WIDGET_CLASS) && sd->state != front) 1746 if (efl_isa(content, EFL_UI_WIDGET_CLASS) && sd->state != front)
1747 elm_widget_tree_unfocusable_set(content, EINA_TRUE); 1747 elm_widget_tree_unfocusable_set(content, EINA_TRUE);
1748 } 1748 }
1749 1749
@@ -1965,9 +1965,9 @@ _internal_elm_flip_go_to(Evas_Object *obj,
1965 else elm_object_focus_set(sd->back.content, EINA_TRUE); 1965 else elm_object_focus_set(sd->back.content, EINA_TRUE);
1966 } 1966 }
1967 1967
1968 if (sd->front.content && efl_isa(sd->front.content, ELM_WIDGET_CLASS)) 1968 if (sd->front.content && efl_isa(sd->front.content, EFL_UI_WIDGET_CLASS))
1969 elm_widget_tree_unfocusable_set(sd->front.content, !front); 1969 elm_widget_tree_unfocusable_set(sd->front.content, !front);
1970 if (sd->back.content && efl_isa(sd->back.content, ELM_WIDGET_CLASS)) 1970 if (sd->back.content && efl_isa(sd->back.content, EFL_UI_WIDGET_CLASS))
1971 elm_widget_tree_unfocusable_set(sd->back.content, front); 1971 elm_widget_tree_unfocusable_set(sd->back.content, front);
1972 1972
1973 1973
diff --git a/src/lib/elementary/efl_ui_flip.eo b/src/lib/elementary/efl_ui_flip.eo
index 7bfd1cf..892ebf9 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
26 page [[Page interaction]] 26 page [[Page interaction]]
27} 27}
28 28
29class Efl.Ui.Flip (Elm.Widget, Efl.Pack.Linear, Efl.Part) 29class Efl.Ui.Flip (Efl.Ui.Widget, Efl.Pack.Linear, Efl.Part)
30{ 30{
31 [[Efl UI flip class]] 31 [[Efl UI flip class]]
32 legacy_prefix: elm_flip; 32 legacy_prefix: elm_flip;
@@ -229,9 +229,9 @@ class Efl.Ui.Flip (Elm.Widget, Efl.Pack.Linear, Efl.Part)
229 implements { 229 implements {
230 class.constructor; 230 class.constructor;
231 Efl.Object.constructor; 231 Efl.Object.constructor;
232 Elm.Widget.widget_sub_object_add; 232 Efl.Ui.Widget.widget_sub_object_add;
233 Elm.Widget.theme_apply; 233 Efl.Ui.Widget.theme_apply;
234 Elm.Widget.widget_sub_object_del; 234 Efl.Ui.Widget.widget_sub_object_del;
235 Efl.Container.content_iterate; 235 Efl.Container.content_iterate;
236 Efl.Container.content_count; 236 Efl.Container.content_count;
237 Efl.Container.content_remove; 237 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 2b2b381..35f7399 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
96 96
97 EINA_SAFETY_ON_NULL_GOTO(elem, cont); 97 EINA_SAFETY_ON_NULL_GOTO(elem, cont);
98 98
99 if (!efl_isa(elem, ELM_WIDGET_CLASS)) 99 if (!efl_isa(elem, EFL_UI_WIDGET_CLASS))
100 { 100 {
101 if (efl_isa(elem, EFL_UI_FOCUS_OBJECT_MIXIN)) 101 if (efl_isa(elem, EFL_UI_FOCUS_OBJECT_MIXIN))
102 { 102 {
@@ -111,7 +111,7 @@ _efl_ui_focus_composition_composition_elements_set(Eo *obj, Efl_Ui_Focus_Composi
111 } 111 }
112 else 112 else
113 { 113 {
114 EINA_SAFETY_ERROR("List contains element that is not EFL_UI_FOCUS_OBJECT_MIXIN or EFL_GFX_INTERFACE or ELM_WIDGET_CLASS"); 114 EINA_SAFETY_ERROR("List contains element that is not EFL_UI_FOCUS_OBJECT_MIXIN or EFL_GFX_INTERFACE or EFL_UI_WIDGET_CLASS");
115 continue; 115 continue;
116 } 116 }
117 } 117 }
@@ -130,7 +130,7 @@ _efl_ui_focus_composition_composition_elements_get(Eo *obj EINA_UNUSED, Efl_Ui_F
130} 130}
131 131
132EOLIAN static Eina_Bool 132EOLIAN static Eina_Bool
133_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) 133_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)
134{ 134{
135 Eina_Bool registered; 135 Eina_Bool registered;
136 136
diff --git a/src/lib/elementary/efl_ui_focus_composition.eo b/src/lib/elementary/efl_ui_focus_composition.eo
index cdf2952..028b1db 100644
--- a/src/lib/elementary/efl_ui_focus_composition.eo
+++ b/src/lib/elementary/efl_ui_focus_composition.eo
@@ -1,4 +1,4 @@
1mixin Efl.Ui.Focus.Composition (Efl.Interface, Elm.Widget ) { 1mixin Efl.Ui.Focus.Composition (Efl.Interface, Efl.Ui.Widget) {
2 [[This defines the inheriting widget as Composition widget. 2 [[This defines the inheriting widget as Composition widget.
3 3
4 A composition widget is a widget that's the logical parent of another set of widgets which can be used for interaction. 4 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 ) {
7 @property composition_elements @protected { 7 @property composition_elements @protected {
8 [[Set the order of elements that will be used for composition 8 [[Set the order of elements that will be used for composition
9 9
10 Elements of the list can be either an Elm.Widget, an Efl.Ui.Focus.Object or an Efl.Gfx. 10 Elements of the list can be either an Efl.Ui.Widget, an Efl.Ui.Focus.Object or an Efl.Gfx.
11 11
12 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. 12 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.
13 13
14 If the element is an Efl.Ui.Focus.Object, then the mixin will take care of registering the element. 14 If the element is an Efl.Ui.Focus.Object, then the mixin will take care of registering the element.
15 15
16 If the element is a Elm.Widget nothing is done and the widget is simply part of the order. 16 If the element is a Efl.Ui.Widget nothing is done and the widget is simply part of the order.
17 ]] 17 ]]
18 values { 18 values {
19 logical_order : list<Efl.Gfx> @owned; [[The order to use]] 19 logical_order : list<Efl.Gfx> @owned; [[The order to use]]
@@ -50,7 +50,7 @@ mixin Efl.Ui.Focus.Composition (Efl.Interface, Elm.Widget ) {
50 } 50 }
51 } 51 }
52 implements { 52 implements {
53 Elm.Widget.focus_state_apply; 53 Efl.Ui.Widget.focus_state_apply;
54 Efl.Ui.Focus.Object.prepare_logical; 54 Efl.Ui.Focus.Object.prepare_logical;
55 @empty .prepare; 55 @empty .prepare;
56 } 56 }
diff --git a/src/lib/elementary/efl_ui_focus_layer.c b/src/lib/elementary/efl_ui_focus_layer.c
index 456c6e9..e19b0f8 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 {
17} Efl_Ui_Focus_Layer_Data; 17} Efl_Ui_Focus_Layer_Data;
18 18
19EOLIAN static Efl_Ui_Focus_Manager* 19EOLIAN static Efl_Ui_Focus_Manager*
20_efl_ui_focus_layer_elm_widget_focus_manager_create(Eo *obj, Efl_Ui_Focus_Layer_Data *pd EINA_UNUSED, Efl_Ui_Focus_Object *root) 20_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)
21{ 21{
22 return efl_add(EFL_UI_FOCUS_MANAGER_ROOT_FOCUS_CLASS, obj, efl_ui_focus_manager_root_set(efl_added, root)); 22 return efl_add(EFL_UI_FOCUS_MANAGER_ROOT_FOCUS_CLASS, obj, efl_ui_focus_manager_root_set(efl_added, root));
23} 23}
@@ -65,7 +65,7 @@ _efl_ui_focus_layer_efl_ui_focus_user_focus_manager_get(Eo *obj, Efl_Ui_Focus_La
65} 65}
66 66
67EOLIAN static Eina_Bool 67EOLIAN static Eina_Bool
68_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) 68_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)
69{ 69{
70 return EINA_FALSE; 70 return EINA_FALSE;
71} 71}
diff --git a/src/lib/elementary/efl_ui_focus_layer.eo b/src/lib/elementary/efl_ui_focus_layer.eo
index 426ca89..5d4b2d8 100644
--- a/src/lib/elementary/efl_ui_focus_layer.eo
+++ b/src/lib/elementary/efl_ui_focus_layer.eo
@@ -1,4 +1,4 @@
1mixin Efl.Ui.Focus.Layer (Efl.Interface, Elm.Widget, Efl.Gfx, Efl.Ui.Focus.Manager) { 1mixin Efl.Ui.Focus.Layer (Efl.Interface, Efl.Ui.Widget, Efl.Gfx, Efl.Ui.Focus.Manager) {
2 [[This defines the inheriting widget as focus layer 2 [[This defines the inheriting widget as focus layer
3 3
4 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. 4 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
21 } 21 }
22 } 22 }
23 implements { 23 implements {
24 Elm.Widget.focus_manager_create; 24 Efl.Ui.Widget.focus_manager_create;
25 Elm.Widget.focus_state_apply; 25 Efl.Ui.Widget.focus_state_apply;
26 Efl.Gfx.visible {set;} 26 Efl.Gfx.visible {set;}
27 Efl.Ui.Focus.Manager.move; 27 Efl.Ui.Focus.Manager.move;
28 Efl.Ui.Focus.User.focus_manager { get; } 28 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 ad1ed62..ca2598c 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 @@
8 8
9typedef struct { 9typedef struct {
10 Eina_Hash *map; 10 Eina_Hash *map;
11 Elm_Widget *container; 11 Efl_Ui_Widget *container;
12 Efl_Ui_Focus_Parent_Provider *provider; 12 Efl_Ui_Focus_Parent_Provider *provider;
13} Efl_Ui_Focus_Parent_Provider_Gen_Data; 13} Efl_Ui_Focus_Parent_Provider_Gen_Data;
14 14
@@ -27,7 +27,7 @@ _efl_ui_focus_parent_provider_gen_content_item_map_get(Eo *obj EINA_UNUSED, Efl_
27} 27}
28 28
29EOLIAN static void 29EOLIAN static void
30_efl_ui_focus_parent_provider_gen_container_set(Eo *obj, Efl_Ui_Focus_Parent_Provider_Gen_Data *pd, Elm_Widget *container) 30_efl_ui_focus_parent_provider_gen_container_set(Eo *obj, Efl_Ui_Focus_Parent_Provider_Gen_Data *pd, Efl_Ui_Widget *container)
31{ 31{
32 EINA_SAFETY_ON_TRUE_RETURN(efl_finalized_get(obj)); 32 EINA_SAFETY_ON_TRUE_RETURN(efl_finalized_get(obj));
33 33
@@ -38,7 +38,7 @@ _efl_ui_focus_parent_provider_gen_container_set(Eo *obj, Efl_Ui_Focus_Parent_Pro
38 pd->provider = efl_provider_find(efl_parent_get(pd->container), EFL_UI_FOCUS_PARENT_PROVIDER_INTERFACE); 38 pd->provider = efl_provider_find(efl_parent_get(pd->container), EFL_UI_FOCUS_PARENT_PROVIDER_INTERFACE);
39} 39}
40 40
41EOLIAN static Elm_Widget* 41EOLIAN static Efl_Ui_Widget*
42_efl_ui_focus_parent_provider_gen_container_get(Eo *obj EINA_UNUSED, Efl_Ui_Focus_Parent_Provider_Gen_Data *pd) 42_efl_ui_focus_parent_provider_gen_container_get(Eo *obj EINA_UNUSED, Efl_Ui_Focus_Parent_Provider_Gen_Data *pd)
43{ 43{
44 return pd->container; 44 return pd->container;
@@ -53,7 +53,7 @@ _efl_ui_focus_parent_provider_gen_efl_ui_focus_parent_provider_find_logical_pare
53 53
54 if (elm_widget_parent_widget_get(widget) != pd->container) 54 if (elm_widget_parent_widget_get(widget) != pd->container)
55 { 55 {
56 Elm_Widget *parent = elm_widget_parent_widget_get(widget); 56 Efl_Ui_Widget *parent = elm_widget_parent_widget_get(widget);
57 //move forward so we get the last widget above the gengrid level, this may be the widget out of the map 57 //move forward so we get the last widget above the gengrid level, this may be the widget out of the map
58 do { 58 do {
59 above_gengrid = parent; 59 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 fbdf7d2..3579544 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)
4 @property content_item_map { 4 @property content_item_map {
5 [[Content item map property]] 5 [[Content item map property]]
6 values { 6 values {
7 map : hash<Elm.Widget, Elm.Widget.Item>; [[Item map]] 7 map : hash<Efl.Ui.Widget, Elm.Widget.Item>; [[Item map]]
8 } 8 }
9 } 9 }
10 @property container { 10 @property container {
11 [[Container property]] 11 [[Container property]]
12 values { 12 values {
13 container : Elm.Widget; [[Container widget]] 13 container : Efl.Ui.Widget; [[Container widget]]
14 } 14 }
15 } 15 }
16 } 16 }
diff --git a/src/lib/elementary/efl_ui_focus_util.c b/src/lib/elementary/efl_ui_focus_util.c
index efb3219..76ec928 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)
18EOLIAN static void 18EOLIAN static void
19_efl_ui_focus_util_focus(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, Efl_Ui_Focus_User *user) 19_efl_ui_focus_util_focus(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, Efl_Ui_Focus_User *user)
20{ 20{
21 Elm_Widget *top, *o; 21 Efl_Ui_Widget *top, *o;
22 Efl_Ui_Focus_Manager *m; 22 Efl_Ui_Focus_Manager *m;
23 m = efl_ui_focus_user_focus_manager_get(user); 23 m = efl_ui_focus_user_focus_manager_get(user);
24 24
diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c
index a807fa5..4240d16 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
721} 721}
722 722
723EOLIAN static Efl_Ui_Theme_Apply 723EOLIAN static Efl_Ui_Theme_Apply
724_efl_ui_image_elm_widget_theme_apply(Eo *obj, Efl_Ui_Image_Data *sd EINA_UNUSED) 724_efl_ui_image_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Image_Data *sd EINA_UNUSED)
725{ 725{
726 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; 726 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
727 727
diff --git a/src/lib/elementary/efl_ui_image.eo b/src/lib/elementary/efl_ui_image.eo
index c7e5815..254077d 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
18 open_error: bool; [[$true if the error happened when opening the file, $false otherwise]] 18 open_error: bool; [[$true if the error happened when opening the file, $false otherwise]]
19} 19}
20 20
21class Efl.Ui.Image (Elm.Widget, Efl.Ui.Clickable, Efl.Ui.Draggable, 21class Efl.Ui.Image (Efl.Ui.Widget, Efl.Ui.Clickable, Efl.Ui.Draggable,
22 Efl.File, Efl.Image, Efl.Image.Load, Efl.Player, Efl.Gfx.View, 22 Efl.File, Efl.Image, Efl.Image.Load, Efl.Player, Efl.Gfx.View,
23 Efl.Access.Image, Efl.Access.Widget.Action, Efl.Gfx.Color, 23 Efl.Access.Image, Efl.Access.Widget.Action, Efl.Gfx.Color,
24 Efl.Orientation, Efl.Flipable, 24 Efl.Orientation, Efl.Flipable,
@@ -116,8 +116,8 @@ class Efl.Ui.Image (Elm.Widget, Efl.Ui.Clickable, Efl.Ui.Draggable,
116 Efl.Ui.Draggable.drag_target { get; set; } 116 Efl.Ui.Draggable.drag_target { get; set; }
117 Efl.Ui.Model.Connect.connect; 117 Efl.Ui.Model.Connect.connect;
118 Efl.Ui.View.model { get; set; } 118 Efl.Ui.View.model { get; set; }
119 Elm.Widget.theme_apply; 119 Efl.Ui.Widget.theme_apply;
120 Elm.Widget.widget_event; 120 Efl.Ui.Widget.widget_event;
121 Efl.Access.Image.extents { get; } 121 Efl.Access.Image.extents { get; }
122 Efl.Access.Widget.Action.elm_actions { get; } 122 Efl.Access.Widget.Action.elm_actions { get; }
123 } 123 }
diff --git a/src/lib/elementary/efl_ui_image_zoomable.c b/src/lib/elementary/efl_ui_image_zoomable.c
index 5592fcf..89eb7c8 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,
863} 863}
864 864
865EOLIAN static Eina_Bool 865EOLIAN static Eina_Bool
866_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) 866_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)
867{ 867{
868 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); 868 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
869 Eina_Bool int_ret = EINA_FALSE; 869 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
888} 888}
889 889
890EOLIAN static Efl_Ui_Theme_Apply 890EOLIAN static Efl_Ui_Theme_Apply
891_efl_ui_image_zoomable_elm_widget_theme_apply(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd) 891_efl_ui_image_zoomable_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd)
892{ 892{
893 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; 893 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
894 Eina_Bool fdo = EINA_FALSE; 894 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 6aa65ea..264f6bb 100644
--- a/src/lib/elementary/efl_ui_image_zoomable.eo
+++ b/src/lib/elementary/efl_ui_image_zoomable.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Image_Zoomable (Elm.Widget, Efl.Ui.Image, Efl.Ui.Zoom, 1class Efl.Ui.Image_Zoomable (Efl.Ui.Widget, Efl.Ui.Image, Efl.Ui.Zoom,
2 Efl.Ui.Scrollable.Interactive, 2 Efl.Ui.Scrollable.Interactive,
3 Efl.Ui.Scrollbar) 3 Efl.Ui.Scrollbar)
4{ 4{
@@ -58,9 +58,9 @@ class Efl.Ui.Image_Zoomable (Elm.Widget, Efl.Ui.Image, Efl.Ui.Zoom,
58 Efl.Ui.Zoom.zoom { set; get; } 58 Efl.Ui.Zoom.zoom { set; get; }
59 Efl.Ui.Zoom.zoom_mode { set; get; } 59 Efl.Ui.Zoom.zoom_mode { set; get; }
60 Efl.Canvas.Group.group_member_add; 60 Efl.Canvas.Group.group_member_add;
61 Elm.Widget.theme_apply; 61 Efl.Ui.Widget.theme_apply;
62 Elm.Widget.on_focus_update; 62 Efl.Ui.Widget.on_focus_update;
63 Elm.Widget.widget_event; 63 Efl.Ui.Widget.widget_event;
64 Efl.Ui.Scrollable.Interactive.scroll; 64 Efl.Ui.Scrollable.Interactive.scroll;
65 Efl.Access.Widget.Action.elm_actions { get; } 65 Efl.Access.Widget.Action.elm_actions { get; }
66 Efl.File.file { get; set; } 66 Efl.File.file { get; set; }
diff --git a/src/lib/elementary/efl_ui_layout.c b/src/lib/elementary/efl_ui_layout.c
index 4c7d86e..aac070e 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,
335} 335}
336 336
337EOLIAN static Eina_Bool 337EOLIAN static Eina_Bool
338_efl_ui_layout_elm_widget_on_disabled_update(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED, Eina_Bool disabled) 338_efl_ui_layout_efl_ui_widget_on_disabled_update(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED, Eina_Bool disabled)
339{ 339{
340 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); 340 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
341 341
@@ -378,7 +378,7 @@ _efl_ui_layout_theme_internal(Eo *obj, Efl_Ui_Layout_Data *sd)
378} 378}
379 379
380EOLIAN static Efl_Ui_Theme_Apply 380EOLIAN static Efl_Ui_Theme_Apply
381_efl_ui_layout_elm_widget_theme_apply(Eo *obj, Efl_Ui_Layout_Data *sd) 381_efl_ui_layout_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Layout_Data *sd)
382{ 382{
383 Efl_Ui_Theme_Apply theme_apply = EFL_UI_THEME_APPLY_FAILED; 383 Efl_Ui_Theme_Apply theme_apply = EFL_UI_THEME_APPLY_FAILED;
384 384
@@ -390,7 +390,7 @@ _efl_ui_layout_elm_widget_theme_apply(Eo *obj, Efl_Ui_Layout_Data *sd)
390} 390}
391 391
392EOLIAN static Eina_Bool 392EOLIAN static Eina_Bool
393_efl_ui_layout_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED, Elm_Object_Item *item EINA_UNUSED) 393_efl_ui_layout_efl_ui_widget_on_focus_update(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED, Elm_Object_Item *item EINA_UNUSED)
394{ 394{
395 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); 395 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
396 396
@@ -416,7 +416,7 @@ _efl_ui_layout_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_
416} 416}
417 417
418EOLIAN static Eina_Bool 418EOLIAN static Eina_Bool
419_efl_ui_layout_elm_widget_widget_sub_object_add(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED, Evas_Object *sobj) 419_efl_ui_layout_efl_ui_widget_widget_sub_object_add(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED, Evas_Object *sobj)
420{ 420{
421 Eina_Bool int_ret = EINA_FALSE; 421 Eina_Bool int_ret = EINA_FALSE;
422 422
@@ -433,7 +433,7 @@ _efl_ui_layout_elm_widget_widget_sub_object_add(Eo *obj, Efl_Ui_Layout_Data *_pd
433} 433}
434 434
435EOLIAN static Eina_Bool 435EOLIAN static Eina_Bool
436_efl_ui_layout_elm_widget_widget_sub_object_del(Eo *obj, Efl_Ui_Layout_Data *sd, Evas_Object *sobj) 436_efl_ui_layout_efl_ui_widget_widget_sub_object_del(Eo *obj, Efl_Ui_Layout_Data *sd, Evas_Object *sobj)
437{ 437{
438 Eina_List *l; 438 Eina_List *l;
439 Efl_Ui_Layout_Sub_Object_Data *sub_d; 439 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
853 EFL_UI_LAYOUT_CHECK(obj) EINA_FALSE; 853 EFL_UI_LAYOUT_CHECK(obj) EINA_FALSE;
854 if (!swallow) 854 if (!swallow)
855 { 855 {
856 swallow = elm_widget_default_content_part_get(obj); 856 swallow = efl_ui_widget_default_content_part_get(obj);
857 if (!swallow) return EINA_FALSE; 857 if (!swallow) return EINA_FALSE;
858 } 858 }
859 else if (!_elm_layout_part_aliasing_eval(obj, &swallow, EINA_FALSE)) 859 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)
937 EFL_UI_LAYOUT_CHECK(obj) NULL; 937 EFL_UI_LAYOUT_CHECK(obj) NULL;
938 if (!swallow) 938 if (!swallow)
939 { 939 {
940 swallow = elm_widget_default_content_part_get(obj); 940 swallow = efl_ui_widget_default_content_part_get(obj);
941 if (!swallow) return NULL; 941 if (!swallow) return NULL;
942 } 942 }
943 else if (!_elm_layout_part_aliasing_eval(obj, &swallow, EINA_FALSE)) 943 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)
971 EFL_UI_LAYOUT_CHECK(obj) NULL; 971 EFL_UI_LAYOUT_CHECK(obj) NULL;
972 if (!swallow) 972 if (!swallow)
973 { 973 {
974 swallow = elm_widget_default_content_part_get(obj); 974 swallow = efl_ui_widget_default_content_part_get(obj);
975 if (!swallow) return NULL; 975 if (!swallow) return NULL;
976 } 976 }
977 else if (!_elm_layout_part_aliasing_eval(obj, &swallow, EINA_FALSE)) 977 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)
2222{ 2222{
2223 if (!part) 2223 if (!part)
2224 { 2224 {
2225 part = elm_widget_default_text_part_get(obj); 2225 part = efl_ui_widget_default_text_part_get(obj);
2226 if (!part) return EINA_FALSE; 2226 if (!part) return EINA_FALSE;
2227 } 2227 }
2228 else if (!_elm_layout_part_aliasing_eval(obj, &part, EINA_TRUE)) 2228 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)
2237{ 2237{
2238 if (!part) 2238 if (!part)
2239 { 2239 {
2240 part = elm_widget_default_text_part_get(obj); 2240 part = efl_ui_widget_default_text_part_get(obj);
2241 if (!part) return NULL; 2241 if (!part) return NULL;
2242 } 2242 }
2243 else if (!_elm_layout_part_aliasing_eval(obj, &part, EINA_TRUE)) 2243 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 987e205..d0d32fe 100644
--- a/src/lib/elementary/efl_ui_layout.eo
+++ b/src/lib/elementary/efl_ui_layout.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Layout (Elm.Widget, Efl.Part, Efl.Container, Efl.File, 1class Efl.Ui.Layout (Efl.Ui.Widget, Efl.Part, Efl.Container, Efl.File,
2 Efl.Ui.View, Efl.Ui.Model.Connect, Efl.Ui.Model.Factory.Connect, 2 Efl.Ui.View, Efl.Ui.Model.Connect, Efl.Ui.Model.Factory.Connect,
3 Efl.Layout.Calc, Efl.Layout.Signal, 3 Efl.Layout.Calc, Efl.Layout.Signal,
4 Efl.Layout.Group) 4 Efl.Layout.Group)
@@ -19,7 +19,7 @@ class Efl.Ui.Layout (Elm.Widget, Efl.Part, Efl.Container, Efl.File,
19 set { 19 set {
20 [[Sets the edje group from the elementary theme that will be used 20 [[Sets the edje group from the elementary theme that will be used
21 as layout. Note that $style will be the new style of this object, 21 as layout. Note that $style will be the new style of this object,
22 as in an @Elm.Widget.style. As a consequence this function can 22 as in an @Efl.Ui.Widget.style. As a consequence this function can
23 only be called during construction of the object, before finalize. 23 only be called during construction of the object, before finalize.
24 24
25 If this returns $false the widget is very likely to become 25 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,
59 Efl.Layout.Group.group_data { get; } 59 Efl.Layout.Group.group_data { get; }
60 Efl.Layout.Group.group_size_min { get; } 60 Efl.Layout.Group.group_size_min { get; }
61 Efl.Layout.Group.group_size_max { get; } 61 Efl.Layout.Group.group_size_max { get; }
62 Elm.Widget.widget_sub_object_add; 62 Efl.Ui.Widget.widget_sub_object_add;
63 Elm.Widget.theme_apply; 63 Efl.Ui.Widget.theme_apply;
64 Elm.Widget.on_disabled_update; 64 Efl.Ui.Widget.on_disabled_update;
65 Elm.Widget.widget_sub_object_del; 65 Efl.Ui.Widget.widget_sub_object_del;
66 Elm.Widget.on_focus_update; 66 Efl.Ui.Widget.on_focus_update;
67 Efl.Container.content_count; 67 Efl.Container.content_count;
68 Efl.Container.content_remove; 68 Efl.Container.content_remove;
69 Efl.Container.content_iterate; 69 Efl.Container.content_iterate;
diff --git a/src/lib/elementary/efl_ui_list.c b/src/lib/elementary/efl_ui_list.c
index 68efe0a..11335b0 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)
667} 667}
668 668
669EOLIAN static Efl_Ui_Focus_Manager* 669EOLIAN static Efl_Ui_Focus_Manager*
670_efl_ui_list_elm_widget_focus_manager_create(Eo *obj EINA_UNUSED, Efl_Ui_List_Data *pd EINA_UNUSED, Efl_Ui_Focus_Object *root) 670_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)
671{ 671{
672 if (!pd->manager) 672 if (!pd->manager)
673 pd->manager = efl_add(EFL_UI_FOCUS_MANAGER_CALC_CLASS, obj, 673 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 72208c8..2ca88bd 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
85// Elm.Widget.activate; 85// Elm.Widget.activate;
86// Elm.Widget.focused_item { get; } 86// Elm.Widget.focused_item { get; }
87// Elm.Widget.focused_object { get; } 87// Elm.Widget.focused_object { get; }
88 Elm.Widget.focus_manager_create; 88 Efl.Ui.Widget.focus_manager_create;
89 Elm.Widget.widget_event; 89 Efl.Ui.Widget.widget_event;
90 90
91// Efl.Ui.Focus.Manager.focus {set; } 91// Efl.Ui.Focus.Manager.focus {set; }
92 //Efl.Ui.Layout.sizing_eval; 92 //Efl.Ui.Layout.sizing_eval;
diff --git a/src/lib/elementary/efl_ui_multibuttonentry.c b/src/lib/elementary/efl_ui_multibuttonentry.c
index c5304f1..ca24ed4 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)
91} 91}
92 92
93EOLIAN static Efl_Ui_Theme_Apply 93EOLIAN static Efl_Ui_Theme_Apply
94_efl_ui_multibuttonentry_elm_widget_theme_apply(Eo *obj, Efl_Ui_Multibuttonentry_Data *sd) 94_efl_ui_multibuttonentry_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Multibuttonentry_Data *sd)
95{ 95{
96 const char *str; 96 const char *str;
97 int hpad = 0, vpad = 0; 97 int hpad = 0, vpad = 0;
@@ -931,7 +931,7 @@ _item_new(Efl_Ui_Multibuttonentry_Data *sd,
931//FIXME: having an empty event handling function and reacting on Evas 931//FIXME: having an empty event handling function and reacting on Evas
932//events on specific objects is crazy, someone should fix that. 932//events on specific objects is crazy, someone should fix that.
933EOLIAN static Eina_Bool 933EOLIAN static Eina_Bool
934_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) 934_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)
935{ 935{
936 // ACCESS 936 // ACCESS
937 if (_elm_config->access_mode == ELM_ACCESS_MODE_ON) return EINA_FALSE; 937 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)
1630} 1630}
1631 1631
1632EOLIAN static void 1632EOLIAN static void
1633_efl_ui_multibuttonentry_elm_widget_on_access_update(Eo *obj, Efl_Ui_Multibuttonentry_Data *sd EINA_UNUSED, Eina_Bool acs) 1633_efl_ui_multibuttonentry_efl_ui_widget_on_access_update(Eo *obj, Efl_Ui_Multibuttonentry_Data *sd EINA_UNUSED, Eina_Bool acs)
1634{ 1634{
1635 _efl_ui_multibuttonentry_smart_focus_next_enable = acs; 1635 _efl_ui_multibuttonentry_smart_focus_next_enable = acs;
1636 _access_obj_process(obj, _efl_ui_multibuttonentry_smart_focus_next_enable); 1636 _access_obj_process(obj, _efl_ui_multibuttonentry_smart_focus_next_enable);
@@ -1652,12 +1652,12 @@ _legacy_focused(void *data, const Efl_Event *ev)
1652 1652
1653 new_focus = efl_ui_focus_manager_focus_get(ev->object); 1653 new_focus = efl_ui_focus_manager_focus_get(ev->object);
1654 1654
1655 if (efl_isa(ev->info, ELM_WIDGET_CLASS) && elm_widget_parent_get(ev->info) == pd->box) 1655 if (efl_isa(ev->info, EFL_UI_WIDGET_CLASS) && elm_widget_parent_get(ev->info) == pd->box)
1656 { 1656 {
1657 meaningful_focus_out = EINA_TRUE; 1657 meaningful_focus_out = EINA_TRUE;
1658 } 1658 }
1659 1659
1660 if (efl_isa(new_focus, ELM_WIDGET_CLASS) && elm_widget_parent_get(new_focus) == pd->box) 1660 if (efl_isa(new_focus, EFL_UI_WIDGET_CLASS) && elm_widget_parent_get(new_focus) == pd->box)
1661 { 1661 {
1662 meaningful_focus_in = EINA_TRUE; 1662 meaningful_focus_in = EINA_TRUE;
1663 } 1663 }
diff --git a/src/lib/elementary/efl_ui_multibuttonentry.eo b/src/lib/elementary/efl_ui_multibuttonentry.eo
index 18654a1..a72e41d 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)
162 implements { 162 implements {
163 class.constructor; 163 class.constructor;
164 Efl.Object.constructor; 164 Efl.Object.constructor;
165 Elm.Widget.theme_apply; 165 Efl.Ui.Widget.theme_apply;
166 Elm.Widget.on_access_update; 166 Efl.Ui.Widget.on_access_update;
167 Efl.Ui.Translatable.translation_update; 167 Efl.Ui.Translatable.translation_update;
168 Elm.Widget.widget_event; 168 Efl.Ui.Widget.widget_event;
169 Efl.Access.children { get; } 169 Efl.Access.children { get; }
170 Efl.Part.part; 170 Efl.Part.part;
171 Efl.Ui.Format.format_cb { set; } 171 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 1431376..a555cbc 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)
116} 116}
117 117
118EOLIAN static Efl_Ui_Theme_Apply 118EOLIAN static Efl_Ui_Theme_Apply
119_efl_ui_nstate_elm_widget_theme_apply(Eo *obj, Efl_Ui_Nstate_Data *pd) 119_efl_ui_nstate_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Nstate_Data *pd)
120{ 120{
121 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; 121 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
122 122
diff --git a/src/lib/elementary/efl_ui_nstate.eo b/src/lib/elementary/efl_ui_nstate.eo
index bdf5da9..5780ded 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)
30 implements { 30 implements {
31 class.constructor; 31 class.constructor;
32 Efl.Object.constructor; 32 Efl.Object.constructor;
33 Elm.Widget.theme_apply; 33 Efl.Ui.Widget.theme_apply;
34 Elm.Widget.widget_event; 34 Efl.Ui.Widget.widget_event;
35 } 35 }
36 events { 36 events {
37 changed; [[Called when the value changed.]] 37 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 f215387..da8e405 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)
111} 111}
112 112
113EOLIAN static Efl_Ui_Theme_Apply 113EOLIAN static Efl_Ui_Theme_Apply
114_efl_ui_panes_elm_widget_theme_apply(Eo *obj, Efl_Ui_Panes_Data *sd) 114_efl_ui_panes_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Panes_Data *sd)
115{ 115{
116 double size; 116 double size;
117 Evas_Coord minw = 0, minh = 0; 117 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 6d98aae..f771f22 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,
47 implements { 47 implements {
48 class.constructor; 48 class.constructor;
49 Efl.Object.constructor; 49 Efl.Object.constructor;
50 Elm.Widget.theme_apply; 50 Efl.Ui.Widget.theme_apply;
51 Efl.Ui.Direction.direction { get; set; [[Only supports $vertical and $horizontal. Default is $vertical.]] } 51 Efl.Ui.Direction.direction { get; set; [[Only supports $vertical and $horizontal. Default is $vertical.]] }
52 Efl.Part.part; 52 Efl.Part.part;
53 } 53 }
diff --git a/src/lib/elementary/efl_ui_popup.c b/src/lib/elementary/efl_ui_popup.c
index c5cf4f5..ccb815a 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)
94} 94}
95 95
96EOLIAN static void 96EOLIAN static void
97_efl_ui_popup_elm_widget_widget_parent_set(Eo *obj, Efl_Ui_Popup_Data *pd EINA_UNUSED, Eo *parent EINA_UNUSED) 97_efl_ui_popup_efl_ui_widget_widget_parent_set(Eo *obj, Efl_Ui_Popup_Data *pd EINA_UNUSED, Eo *parent EINA_UNUSED)
98{ 98{
99 pd->win_parent = efl_provider_find(obj, EFL_UI_WIN_CLASS); 99 pd->win_parent = efl_provider_find(obj, EFL_UI_WIN_CLASS);
100 if (!pd->win_parent) 100 if (!pd->win_parent)
diff --git a/src/lib/elementary/efl_ui_popup.eo b/src/lib/elementary/efl_ui_popup.eo
index 62067e7..147dd17 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)
58 Efl.Gfx.position { set; } 58 Efl.Gfx.position { set; }
59 Efl.Gfx.size { set;} 59 Efl.Gfx.size { set;}
60 Efl.Gfx.visible { set; } 60 Efl.Gfx.visible { set; }
61 Elm.Widget.widget_parent { set; } 61 Efl.Ui.Widget.widget_parent { set; }
62 Efl.Content.content { get; set; } 62 Efl.Content.content { get; set; }
63 Efl.Content.content_unset; 63 Efl.Content.content_unset;
64 Efl.Part.part; 64 Efl.Part.part;
diff --git a/src/lib/elementary/efl_ui_progressbar.c b/src/lib/elementary/efl_ui_progressbar.c
index 19b8933..6c41b66 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)
179} 179}
180 180
181EOLIAN static Eina_Bool 181EOLIAN static Eina_Bool
182_efl_ui_progressbar_elm_widget_widget_sub_object_del(Eo *obj, Efl_Ui_Progressbar_Data *pd EINA_UNUSED, Evas_Object *sobj) 182_efl_ui_progressbar_efl_ui_widget_widget_sub_object_del(Eo *obj, Efl_Ui_Progressbar_Data *pd EINA_UNUSED, Evas_Object *sobj)
183{ 183{
184 if (!efl_ui_widget_sub_object_del(efl_super(obj, MY_CLASS), sobj)) 184 if (!efl_ui_widget_sub_object_del(efl_super(obj, MY_CLASS), sobj))
185 return EINA_FALSE; 185 return EINA_FALSE;
@@ -189,7 +189,7 @@ _efl_ui_progressbar_elm_widget_widget_sub_object_del(Eo *obj, Efl_Ui_Progressbar
189} 189}
190 190
191static Eina_Bool 191static Eina_Bool
192_efl_ui_progressbar_elm_widget_widget_sub_object_add(Eo *obj, Efl_Ui_Progressbar_Data *pd EINA_UNUSED, Evas_Object *sobj) 192_efl_ui_progressbar_efl_ui_widget_widget_sub_object_add(Eo *obj, Efl_Ui_Progressbar_Data *pd EINA_UNUSED, Evas_Object *sobj)
193{ 193{
194 if (!efl_ui_widget_sub_object_add(efl_super(obj, MY_CLASS), sobj)) 194 if (!efl_ui_widget_sub_object_add(efl_super(obj, MY_CLASS), sobj))
195 return EINA_FALSE; 195 return EINA_FALSE;
@@ -257,7 +257,7 @@ _efl_ui_progressbar_theme_group_get(Evas_Object *obj, Efl_Ui_Progressbar_Data *s
257} 257}
258 258
259EOLIAN static Efl_Ui_Theme_Apply 259EOLIAN static Efl_Ui_Theme_Apply
260_efl_ui_progressbar_elm_widget_theme_apply(Eo *obj, Efl_Ui_Progressbar_Data *sd) 260_efl_ui_progressbar_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Progressbar_Data *sd)
261{ 261{
262 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; 262 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
263 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED); 263 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 90d1726..0591030 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,
50 implements { 50 implements {
51 class.constructor; 51 class.constructor;
52 Efl.Object.constructor; 52 Efl.Object.constructor;
53 Elm.Widget.theme_apply; 53 Efl.Ui.Widget.theme_apply;
54 Elm.Widget.widget_sub_object_add; 54 Efl.Ui.Widget.widget_sub_object_add;
55 Elm.Widget.widget_sub_object_del; 55 Efl.Ui.Widget.widget_sub_object_del;
56 Efl.Ui.Range.range_value { get; set; } 56 Efl.Ui.Range.range_value { get; set; }
57 Efl.Ui.Direction.direction { get; set; } 57 Efl.Ui.Direction.direction { get; set; }
58 Efl.Ui.Format.format_cb { set; } 58 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 cd5c157..51d406c 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)
148} 148}
149 149
150EOLIAN static Efl_Ui_Theme_Apply 150EOLIAN static Efl_Ui_Theme_Apply
151_efl_ui_radio_elm_widget_theme_apply(Eo *obj, Efl_Ui_Radio_Data *sd) 151_efl_ui_radio_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Radio_Data *sd)
152{ 152{
153 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED); 153 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED);
154 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; 154 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)
325} 325}
326 326
327EOLIAN static Eina_Bool 327EOLIAN static Eina_Bool
328_efl_ui_radio_elm_widget_on_access_activate(Eo *obj, Efl_Ui_Radio_Data *_pd EINA_UNUSED, Efl_Ui_Activate act) 328_efl_ui_radio_efl_ui_widget_on_access_activate(Eo *obj, Efl_Ui_Radio_Data *_pd EINA_UNUSED, Efl_Ui_Activate act)
329{ 329{
330 if (elm_widget_disabled_get(obj)) return EINA_FALSE; 330 if (elm_widget_disabled_get(obj)) return EINA_FALSE;
331 if (act != EFL_UI_ACTIVATE_DEFAULT) return EINA_FALSE; 331 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 ce51b18..35602e8 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)
62 class.constructor; 62 class.constructor;
63 Efl.Object.constructor; 63 Efl.Object.constructor;
64 Efl.Object.destructor; 64 Efl.Object.destructor;
65 Elm.Widget.theme_apply; 65 Efl.Ui.Widget.theme_apply;
66 Elm.Widget.on_access_activate; 66 Efl.Ui.Widget.on_access_activate;
67 Elm.Widget.widget_event; 67 Efl.Ui.Widget.widget_event;
68 Efl.Access.state_set { get; } 68 Efl.Access.state_set { get; }
69 Efl.Access.Widget.Action.elm_actions { get; } 69 Efl.Access.Widget.Action.elm_actions { get; }
70 Efl.Content.content { get; set; } 70 Efl.Content.content { get; set; }
diff --git a/src/lib/elementary/efl_ui_scroller.c b/src/lib/elementary/efl_ui_scroller.c
index e10d5b6..83e3f96 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)
514} 514}
515 515
516EOLIAN static Efl_Ui_Theme_Apply 516EOLIAN static Efl_Ui_Theme_Apply
517_efl_ui_scroller_elm_widget_theme_apply(Eo *obj, Efl_Ui_Scroller_Data *sd) 517_efl_ui_scroller_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Scroller_Data *sd)
518{ 518{
519 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; 519 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
520 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 520 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 805e0de..fd73d8c 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,
10 Efl.Object.finalize; 10 Efl.Object.finalize;
11 Efl.Object.destructor; 11 Efl.Object.destructor;
12 Efl.Content.content { set; } 12 Efl.Content.content { set; }
13 Elm.Widget.theme_apply; 13 Efl.Ui.Widget.theme_apply;
14 Efl.Ui.Scrollable.Interactive.content_size{ get; } 14 Efl.Ui.Scrollable.Interactive.content_size{ get; }
15 Efl.Ui.Scrollable.Interactive.viewport_geometry{ get; } 15 Efl.Ui.Scrollable.Interactive.viewport_geometry{ get; }
16 Efl.Ui.Scrollable.Interactive.bounce_enabled { set; get; } 16 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 d316278..e385867 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)
526 return ECORE_CALLBACK_CANCEL; 526 return ECORE_CALLBACK_CANCEL;
527} 527}
528 528
529// _slider_elm_widget_widget_event 529// _slider_efl_ui_widget_widget_event
530ELM_WIDGET_KEY_DOWN_DEFAULT_IMPLEMENT(slider, Efl_Ui_Slider_Data) 530ELM_WIDGET_KEY_DOWN_DEFAULT_IMPLEMENT(slider, Efl_Ui_Slider_Data)
531 531
532EOLIAN static Eina_Bool 532EOLIAN static Eina_Bool
533_efl_ui_slider_elm_widget_widget_event(Eo *obj, Efl_Ui_Slider_Data *sd, const Efl_Event *eo_event, Evas_Object *src) 533_efl_ui_slider_efl_ui_widget_widget_event(Eo *obj, Efl_Ui_Slider_Data *sd, const Efl_Event *eo_event, Evas_Object *src)
534{ 534{
535 Eo *ev = eo_event->info; 535 Eo *ev = eo_event->info;
536 536
537 if (eo_event->desc == EFL_EVENT_KEY_DOWN) 537 if (eo_event->desc == EFL_EVENT_KEY_DOWN)
538 { 538 {
539 if (!_slider_elm_widget_widget_event(obj, sd, eo_event, src)) 539 if (!_slider_efl_ui_widget_widget_event(obj, sd, eo_event, src))
540 return EINA_FALSE; 540 return EINA_FALSE;
541 } 541 }
542 else if (eo_event->desc == EFL_EVENT_KEY_UP) 542 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
565} 565}
566 566
567EOLIAN static Eina_Bool 567EOLIAN static Eina_Bool
568_efl_ui_slider_elm_widget_on_access_activate(Eo *obj, Efl_Ui_Slider_Data *sd, Efl_Ui_Activate act) 568_efl_ui_slider_efl_ui_widget_on_access_activate(Eo *obj, Efl_Ui_Slider_Data *sd, Efl_Ui_Activate act)
569{ 569{
570 if (elm_widget_disabled_get(obj)) return EINA_FALSE; 570 if (elm_widget_disabled_get(obj)) return EINA_FALSE;
571 if (act == EFL_UI_ACTIVATE_DEFAULT) return EINA_FALSE; 571 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)
779} 779}
780 780
781EOLIAN static Efl_Ui_Theme_Apply 781EOLIAN static Efl_Ui_Theme_Apply
782_efl_ui_slider_elm_widget_theme_apply(Eo *obj, Efl_Ui_Slider_Data *sd) 782_efl_ui_slider_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Slider_Data *sd)
783{ 783{
784 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; 784 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
785 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED); 785 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)
1299} 1299}
1300 1300
1301EOLIAN static Eina_Bool 1301EOLIAN static Eina_Bool
1302_efl_ui_slider_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Slider_Data *sd EINA_UNUSED, Elm_Object_Item *item EINA_UNUSED) 1302_efl_ui_slider_efl_ui_widget_on_focus_update(Eo *obj, Efl_Ui_Slider_Data *sd EINA_UNUSED, Elm_Object_Item *item EINA_UNUSED)
1303{ 1303{
1304 Eina_Bool int_ret = EINA_FALSE; 1304 Eina_Bool int_ret = EINA_FALSE;
1305 1305
diff --git a/src/lib/elementary/efl_ui_slider.eo b/src/lib/elementary/efl_ui_slider.eo
index 6a464cf..55007f3 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,
37 class.constructor; 37 class.constructor;
38 Efl.Object.constructor; 38 Efl.Object.constructor;
39 Efl.Canvas.Group.group_calculate; 39 Efl.Canvas.Group.group_calculate;
40 Elm.Widget.theme_apply; 40 Efl.Ui.Widget.theme_apply;
41 Elm.Widget.on_access_activate; 41 Efl.Ui.Widget.on_access_activate;
42 Elm.Widget.on_focus_update; 42 Efl.Ui.Widget.on_focus_update;
43 Elm.Widget.widget_event; 43 Efl.Ui.Widget.widget_event;
44 Efl.Ui.Range.range_value { get; set; } 44 Efl.Ui.Range.range_value { get; set; }
45 Efl.Ui.Range.range_min_max {get; set; } 45 Efl.Ui.Range.range_min_max {get; set; }
46 Efl.Ui.Direction.direction { get; set; } 46 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 d24d20d..ad73ab4 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)
151} 151}
152 152
153EOLIAN static Eina_Bool 153EOLIAN static Eina_Bool
154_efl_ui_spin_elm_widget_widget_event(Eo *obj, Efl_Ui_Spin_Data *sd, const Efl_Event *eo_event, Evas_Object *src EINA_UNUSED) 154_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)
155{ 155{
156 Eo *ev = eo_event->info; 156 Eo *ev = eo_event->info;
157 157
diff --git a/src/lib/elementary/efl_ui_spin.eo b/src/lib/elementary/efl_ui_spin.eo
index 20b33a0..d88e42d 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,
11 implements { 11 implements {
12 Efl.Object.constructor; 12 Efl.Object.constructor;
13 Efl.Object.destructor; 13 Efl.Object.destructor;
14 Elm.Widget.widget_event; 14 Efl.Ui.Widget.widget_event;
15 Efl.Ui.Range.range_min_max { get; set; } 15 Efl.Ui.Range.range_min_max { get; set; }
16 Efl.Ui.Range.range_step { get; set; } 16 Efl.Ui.Range.range_step { get; set; }
17 Efl.Ui.Range.range_value { get; set; } 17 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 73d71cb..6fa35c6 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)
536} 536}
537 537
538EOLIAN static Eina_Bool 538EOLIAN static Eina_Bool
539_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) 539_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)
540{ 540{
541 Eo *ev = eo_event->info; 541 Eo *ev = eo_event->info;
542 542
@@ -568,7 +568,7 @@ _efl_ui_spin_button_elm_widget_widget_event(Eo *obj, Efl_Ui_Spin_Button_Data *sd
568} 568}
569 569
570EOLIAN static Eina_Bool 570EOLIAN static Eina_Bool
571_efl_ui_spin_button_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Spin_Button_Data *sd, Elm_Object_Item *item EINA_UNUSED) 571_efl_ui_spin_button_efl_ui_widget_on_focus_update(Eo *obj, Efl_Ui_Spin_Button_Data *sd, Elm_Object_Item *item EINA_UNUSED)
572{ 572{
573 Eina_Bool int_ret = EINA_FALSE; 573 Eina_Bool int_ret = EINA_FALSE;
574 574
@@ -714,7 +714,7 @@ _access_spinner_register(Evas_Object *obj, Eina_Bool is_access)
714} 714}
715 715
716EOLIAN static Efl_Ui_Theme_Apply 716EOLIAN static Efl_Ui_Theme_Apply
717_efl_ui_spin_button_elm_widget_theme_apply(Eo *obj, Efl_Ui_Spin_Button_Data *sd EINA_UNUSED) 717_efl_ui_spin_button_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Spin_Button_Data *sd EINA_UNUSED)
718{ 718{
719 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; 719 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
720 720
diff --git a/src/lib/elementary/efl_ui_spin_button.eo b/src/lib/elementary/efl_ui_spin_button.eo
index c6b88a0..581e0b4 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,
64 } 64 }
65 implements { 65 implements {
66 Efl.Object.constructor; 66 Efl.Object.constructor;
67 Elm.Widget.theme_apply; 67 Efl.Ui.Widget.theme_apply;
68 Elm.Widget.widget_event; 68 Efl.Ui.Widget.widget_event;
69 Elm.Widget.on_focus_update; 69 Efl.Ui.Widget.on_focus_update;
70 Efl.Ui.Range.range_value { set; } 70 Efl.Ui.Range.range_value { set; }
71 Efl.Access.name { get; } 71 Efl.Access.name { get; }
72 Efl.Access.Value.value_and_text { get; set; } 72 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 39aa7b8..c1ce678 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)
29} 29}
30 30
31EOLIAN static Efl_Ui_Theme_Apply 31EOLIAN static Efl_Ui_Theme_Apply
32_efl_ui_table_elm_widget_theme_apply(Eo *obj, Efl_Ui_Table_Data *pd EINA_UNUSED) 32_efl_ui_table_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Table_Data *pd EINA_UNUSED)
33{ 33{
34 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; 34 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
35 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 35 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 77086e7..7782c43 100644
--- a/src/lib/elementary/efl_ui_table.eo
+++ b/src/lib/elementary/efl_ui_table.eo
@@ -1,11 +1,11 @@
1class Efl.Ui.Table (Elm.Widget, Efl.Pack.Table, Efl.Pack.Layout, 1class Efl.Ui.Table (Efl.Ui.Widget, Efl.Pack.Table, Efl.Pack.Layout,
2 Efl.Ui.Direction) 2 Efl.Ui.Direction)
3{ 3{
4 [[Efl UI table class]] 4 [[Efl UI table class]]
5 implements { 5 implements {
6 Efl.Object.constructor; 6 Efl.Object.constructor;
7 Efl.Canvas.Group.group_calculate; 7 Efl.Canvas.Group.group_calculate;
8 Elm.Widget.theme_apply; 8 Efl.Ui.Widget.theme_apply;
9 //Efl.Container.content_remove; // TODO 9 //Efl.Container.content_remove; // TODO
10 Efl.Container.content_iterate; 10 Efl.Container.content_iterate;
11 Efl.Container.content_count; 11 Efl.Container.content_count;
diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c
index 4f3e45f..43146f5 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)
792 792
793/* we can't reuse layout's here, because it's on entry_edje only */ 793/* we can't reuse layout's here, because it's on entry_edje only */
794EOLIAN static Eina_Bool 794EOLIAN static Eina_Bool
795_efl_ui_text_elm_widget_on_disabled_update(Eo *obj, Efl_Ui_Text_Data *sd, Eina_Bool disabled) 795_efl_ui_text_efl_ui_widget_on_disabled_update(Eo *obj, Efl_Ui_Text_Data *sd, Eina_Bool disabled)
796{ 796{
797 const char *emission ; 797 const char *emission ;
798 798
@@ -852,7 +852,7 @@ _efl_ui_text_background_switch(Evas_Object *from_edje, Evas_Object *to_edje)
852/* we can't issue the layout's theming code here, cause it assumes an 852/* we can't issue the layout's theming code here, cause it assumes an
853 * unique edje object, always */ 853 * unique edje object, always */
854EOLIAN static Efl_Ui_Theme_Apply 854EOLIAN static Efl_Ui_Theme_Apply
855_efl_ui_text_elm_widget_theme_apply(Eo *obj, Efl_Ui_Text_Data *sd) 855_efl_ui_text_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Text_Data *sd)
856{ 856{
857 const char *str; 857 const char *str;
858 Efl_Ui_Theme_Apply theme_apply; 858 Efl_Ui_Theme_Apply theme_apply;
@@ -861,7 +861,7 @@ _efl_ui_text_elm_widget_theme_apply(Eo *obj, Efl_Ui_Text_Data *sd)
861 861
862 // Note: We are skipping elm_layout here! This is by design. 862 // Note: We are skipping elm_layout here! This is by design.
863 // This assumes the following inheritance: my_class -> layout -> widget ... 863 // This assumes the following inheritance: my_class -> layout -> widget ...
864 theme_apply = efl_ui_widget_theme_apply(efl_cast(obj, ELM_WIDGET_CLASS)); 864 theme_apply = efl_ui_widget_theme_apply(efl_cast(obj, EFL_UI_WIDGET_CLASS));
865 if (!theme_apply) return EFL_UI_THEME_APPLY_FAILED; 865 if (!theme_apply) return EFL_UI_THEME_APPLY_FAILED;
866 866
867 efl_event_freeze(obj); 867 efl_event_freeze(obj);
@@ -1126,7 +1126,7 @@ _return_key_enabled_check(Evas_Object *obj)
1126} 1126}
1127 1127
1128EOLIAN static Eina_Bool 1128EOLIAN static Eina_Bool
1129_efl_ui_text_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Text_Data *sd, Elm_Object_Item *item EINA_UNUSED) 1129_efl_ui_text_efl_ui_widget_on_focus_update(Eo *obj, Efl_Ui_Text_Data *sd, Elm_Object_Item *item EINA_UNUSED)
1130{ 1130{
1131 Evas_Object *top; 1131 Evas_Object *top;
1132 Eina_Bool top_is_win = EINA_FALSE; 1132 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
1185} 1185}
1186 1186
1187EOLIAN static Eina_Rect 1187EOLIAN static Eina_Rect
1188_efl_ui_text_elm_widget_interest_region_get(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd) 1188_efl_ui_text_efl_ui_widget_interest_region_get(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd)
1189{ 1189{
1190 Evas_Coord edje_x, edje_y, elm_x, elm_y; 1190 Evas_Coord edje_x, edje_y, elm_x, elm_y;
1191 Eina_Rect r = {}; 1191 Eina_Rect r = {};
@@ -1220,7 +1220,7 @@ _show_region_hook(void *data EINA_UNUSED, Evas_Object *obj, Eina_Rect r)
1220} 1220}
1221 1221
1222EOLIAN static Eina_Bool 1222EOLIAN static Eina_Bool
1223_efl_ui_text_elm_widget_widget_sub_object_del(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, Evas_Object *sobj) 1223_efl_ui_text_efl_ui_widget_widget_sub_object_del(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, Evas_Object *sobj)
1224{ 1224{
1225 Eina_Bool ret = EINA_FALSE; 1225 Eina_Bool ret = EINA_FALSE;
1226 /* unfortunately entry doesn't follow the signal pattern 1226 /* 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)
3968/* END - ANCHOR HOVER */ 3968/* END - ANCHOR HOVER */
3969 3969
3970EOLIAN static Eina_Bool 3970EOLIAN static Eina_Bool
3971_efl_ui_text_elm_widget_on_access_activate(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, Efl_Ui_Activate act) 3971_efl_ui_text_efl_ui_widget_on_access_activate(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, Efl_Ui_Activate act)
3972{ 3972{
3973 if (act != EFL_UI_ACTIVATE_DEFAULT) return EINA_FALSE; 3973 if (act != EFL_UI_ACTIVATE_DEFAULT) return EINA_FALSE;
3974 3974
diff --git a/src/lib/elementary/efl_ui_text.eo b/src/lib/elementary/efl_ui_text.eo
index 5075af5..7df95db 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,
357 Efl.Layout.Signal.signal_callback_add; 357 Efl.Layout.Signal.signal_callback_add;
358 Efl.Layout.Signal.signal_callback_del; 358 Efl.Layout.Signal.signal_callback_del;
359 Efl.Layout.Signal.signal_emit; 359 Efl.Layout.Signal.signal_emit;
360 Elm.Widget.on_access_activate; 360 Efl.Ui.Widget.on_access_activate;
361 Elm.Widget.theme_apply; 361 Efl.Ui.Widget.theme_apply;
362 Elm.Widget.on_focus_update; 362 Efl.Ui.Widget.on_focus_update;
363 Elm.Widget.interest_region { get; } 363 Efl.Ui.Widget.interest_region { get; }
364 Elm.Widget.on_disabled_update; 364 Efl.Ui.Widget.on_disabled_update;
365 Elm.Widget.widget_sub_object_del; 365 Efl.Ui.Widget.widget_sub_object_del;
366 Elm.Interface_Scrollable.policy { set; } 366 Elm.Interface_Scrollable.policy { set; }
367 Elm.Interface_Scrollable.bounce_allow { set; } 367 Elm.Interface_Scrollable.bounce_allow { set; }
368 Efl.Access.state_set { get; } 368 Efl.Access.state_set { get; }
diff --git a/src/lib/elementary/efl_ui_textpath.c b/src/lib/elementary/efl_ui_textpath.c
index 9a64896..f133de5 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
543} 543}
544 544
545EOLIAN static Efl_Ui_Theme_Apply 545EOLIAN static Efl_Ui_Theme_Apply
546_efl_ui_textpath_elm_widget_theme_apply(Eo *obj, Efl_Ui_Textpath_Data *pd) 546_efl_ui_textpath_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Textpath_Data *pd)
547{ 547{
548 Efl_Ui_Theme_Apply ret = EFL_UI_THEME_APPLY_FAILED; 548 Efl_Ui_Theme_Apply ret = EFL_UI_THEME_APPLY_FAILED;
549 549
diff --git a/src/lib/elementary/efl_ui_textpath.eo b/src/lib/elementary/efl_ui_textpath.eo
index 9c8faf9..40743bb 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)
51 Efl.Canvas.Group.group_calculate; 51 Efl.Canvas.Group.group_calculate;
52 Efl.Text.text {get; set;} 52 Efl.Text.text {get; set;}
53 Efl.Part.part; 53 Efl.Part.part;
54 Elm.Widget.theme_apply; 54 Efl.Ui.Widget.theme_apply;
55 Efl.Gfx.position { set; } 55 Efl.Gfx.position { set; }
56 Efl.Gfx.size { set; } 56 Efl.Gfx.size { set; }
57 } 57 }
diff --git a/src/lib/elementary/efl_ui_video.eo b/src/lib/elementary/efl_ui_video.eo
index f5a7940..87d4b58 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,
64 class.constructor; 64 class.constructor;
65 Efl.Object.constructor; 65 Efl.Object.constructor;
66 Efl.File.file { get; set; } 66 Efl.File.file { get; set; }
67 Elm.Widget.widget_event; 67 Efl.Ui.Widget.widget_event;
68 Efl.Access.Widget.Action.elm_actions { get; } 68 Efl.Access.Widget.Action.elm_actions { get; }
69 } 69 }
70} 70}
diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/efl_ui_widget.c
index 3d908f1..4767f9a 100644
--- a/src/lib/elementary/elm_widget.c
+++ b/src/lib/elementary/efl_ui_widget.c
@@ -24,9 +24,9 @@
24#define EFL_INTERNAL_UNSTABLE 24#define EFL_INTERNAL_UNSTABLE
25#include "interfaces/efl_common_internal.h" 25#include "interfaces/efl_common_internal.h"
26 26
27#define MY_CLASS ELM_WIDGET_CLASS 27#define MY_CLASS EFL_UI_WIDGET_CLASS
28 28
29#define MY_CLASS_NAME "Elm_Widget" 29#define MY_CLASS_NAME "Efl_Ui_Widget"
30#define MY_CLASS_NAME_LEGACY "elm_widget" 30#define MY_CLASS_NAME_LEGACY "elm_widget"
31 31
32#define ELM_WIDGET_DATA_GET(o, wd) \ 32#define ELM_WIDGET_DATA_GET(o, wd) \
@@ -42,7 +42,7 @@
42 if (!sd) return 42 if (!sd) return
43 43
44#define ELM_WIDGET_FOCUS_GET(obj) \ 44#define ELM_WIDGET_FOCUS_GET(obj) \
45 (efl_isa(obj, ELM_WIDGET_CLASS) && \ 45 (efl_isa(obj, EFL_UI_WIDGET_CLASS) && \
46 ((_elm_access_auto_highlight_get()) ? (elm_widget_highlight_get(obj)) : \ 46 ((_elm_access_auto_highlight_get()) ? (elm_widget_highlight_get(obj)) : \
47 (efl_ui_focus_object_focus_get(obj)))) 47 (efl_ui_focus_object_focus_get(obj))))
48 48
@@ -114,7 +114,7 @@ static void
114_on_sub_obj_del(void *data, const Efl_Event *event); 114_on_sub_obj_del(void *data, const Efl_Event *event);
115static void _propagate_event(void *data, const Efl_Event *eo_event); 115static void _propagate_event(void *data, const Efl_Event *eo_event);
116static void _elm_widget_focus_tree_unfocusable_handle(Eo *obj); 116static void _elm_widget_focus_tree_unfocusable_handle(Eo *obj);
117static void _elm_widget_shadow_update(Elm_Widget *obj); 117static void _elm_widget_shadow_update(Efl_Ui_Widget *obj);
118 118
119EFL_CALLBACKS_ARRAY_DEFINE(elm_widget_subitems_callbacks, 119EFL_CALLBACKS_ARRAY_DEFINE(elm_widget_subitems_callbacks,
120 { EFL_EVENT_DEL, _on_sub_obj_del }); 120 { EFL_EVENT_DEL, _on_sub_obj_del });
@@ -184,7 +184,7 @@ _elm_widget_focus_highlight_start(const Evas_Object *obj)
184} 184}
185 185
186Evas_Object * 186Evas_Object *
187_elm_widget_focus_highlight_object_get(const Evas_Object *obj) 187_efl_ui_widget_focus_highlight_object_get(const Evas_Object *obj)
188{ 188{
189 Evas_Object *top = elm_widget_top_get(obj); 189 Evas_Object *top = elm_widget_top_get(obj);
190 190
@@ -194,7 +194,7 @@ _elm_widget_focus_highlight_object_get(const Evas_Object *obj)
194} 194}
195 195
196EOLIAN static Eina_Bool 196EOLIAN static Eina_Bool
197_elm_widget_focus_highlight_enabled_get(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED) 197_efl_ui_widget_focus_highlight_enabled_get(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED)
198{ 198{
199 // Forward to closest parent Window 199 // Forward to closest parent Window
200 const Evas_Object *win = elm_widget_top_get(obj); 200 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_
206} 206}
207 207
208EOLIAN static void 208EOLIAN static void
209_elm_widget_focus_highlight_enabled_set(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED, Eina_Bool enable) 209_efl_ui_widget_focus_highlight_enabled_set(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED, Eina_Bool enable)
210{ 210{
211 // Forward to closest parent Window 211 // Forward to closest parent Window
212 Evas_Object *win = elm_widget_top_get(obj); 212 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_
216} 216}
217 217
218EOLIAN static Eina_Bool 218EOLIAN static Eina_Bool
219_elm_widget_focus_highlight_animate_get(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED) 219_efl_ui_widget_focus_highlight_animate_get(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED)
220{ 220{
221 // Forward to closest parent Window 221 // Forward to closest parent Window
222 const Evas_Object *win = elm_widget_top_get(obj); 222 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_
228} 228}
229 229
230EOLIAN static void 230EOLIAN static void
231_elm_widget_focus_highlight_animate_set(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED, Eina_Bool enable) 231_efl_ui_widget_focus_highlight_animate_set(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED, Eina_Bool enable)
232{ 232{
233 // Forward to closest parent Window 233 // Forward to closest parent Window
234 Evas_Object *win = elm_widget_top_get(obj); 234 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_
238} 238}
239 239
240EOLIAN static Eina_Bool 240EOLIAN static Eina_Bool
241_elm_widget_focus_highlight_style_set(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED, const char *style) 241_efl_ui_widget_focus_highlight_style_set(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED, const char *style)
242{ 242{
243 // Forward to closest parent Window 243 // Forward to closest parent Window
244 Evas_Object *win = elm_widget_top_get(obj); 244 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
250} 250}
251 251
252EOLIAN static const char * 252EOLIAN static const char *
253_elm_widget_focus_highlight_style_get(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED) 253_efl_ui_widget_focus_highlight_style_get(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED)
254{ 254{
255 // Forward to closest parent Window 255 // Forward to closest parent Window
256 Evas_Object *win = elm_widget_top_get(obj); 256 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
264static Eina_Bool 264static Eina_Bool
265_tree_unfocusable(Eo *obj) 265_tree_unfocusable(Eo *obj)
266{ 266{
267 Elm_Widget *wid = obj; 267 Efl_Ui_Widget *wid = obj;
268 268
269 do { 269 do {
270 ELM_WIDGET_DATA_GET(wid, wid_pd); 270 ELM_WIDGET_DATA_GET(wid, wid_pd);
@@ -278,7 +278,7 @@ _tree_unfocusable(Eo *obj)
278static Eina_Bool 278static Eina_Bool
279_tree_disabled(Eo *obj) 279_tree_disabled(Eo *obj)
280{ 280{
281 Elm_Widget *wid = obj; 281 Efl_Ui_Widget *wid = obj;
282 282
283 do { 283 do {
284 ELM_WIDGET_DATA_GET(wid, wid_pd); 284 ELM_WIDGET_DATA_GET(wid, wid_pd);
@@ -335,7 +335,7 @@ _focus_manager_eval(Eo *obj, Elm_Widget_Smart_Data *pd)
335} 335}
336 336
337EOLIAN static Eina_Bool 337EOLIAN static Eina_Bool
338_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) 338_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)
339{ 339{
340 Eina_Bool registered = EINA_TRUE; 340 Eina_Bool registered = EINA_TRUE;
341 341
@@ -451,7 +451,7 @@ _focus_state_eval(Eo *obj, Elm_Widget_Smart_Data *pd, Eina_Bool should, Eina_Boo
451static Efl_Ui_Focus_Object* 451static Efl_Ui_Focus_Object*
452_logical_parent_eval(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd, Eina_Bool should) 452_logical_parent_eval(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd, Eina_Bool should)
453{ 453{
454 Elm_Widget *parent; 454 Efl_Ui_Widget *parent;
455 Efl_Ui_Focus_Parent_Provider *provider; 455 Efl_Ui_Focus_Parent_Provider *provider;
456 456
457 if (should) 457 if (should)
@@ -471,7 +471,7 @@ _logical_parent_eval(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd, Eina_Bool s
471 //update old logical parent; 471 //update old logical parent;
472 if (pd->logical.parent) 472 if (pd->logical.parent)
473 { 473 {
474 if (efl_isa(pd->logical.parent, ELM_WIDGET_CLASS)) 474 if (efl_isa(pd->logical.parent, EFL_UI_WIDGET_CLASS))
475 { 475 {
476 ELM_WIDGET_DATA_GET(pd->logical.parent, logical_wd); 476 ELM_WIDGET_DATA_GET(pd->logical.parent, logical_wd);
477 if (!logical_wd) 477 if (!logical_wd)
@@ -487,7 +487,7 @@ _logical_parent_eval(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd, Eina_Bool s
487 } 487 }
488 if (parent) 488 if (parent)
489 { 489 {
490 if (efl_isa(parent, ELM_WIDGET_CLASS)) 490 if (efl_isa(parent, EFL_UI_WIDGET_CLASS))
491 { 491 {
492 ELM_WIDGET_DATA_GET(parent, parent_wd); 492 ELM_WIDGET_DATA_GET(parent, parent_wd);
493 if (!parent_wd) 493 if (!parent_wd)
@@ -517,14 +517,14 @@ _full_eval(Eo *obj, Elm_Widget_Smart_Data *pd)
517 517
518 old_parent = _logical_parent_eval(obj, pd, should); 518 old_parent = _logical_parent_eval(obj, pd, should);
519 519
520 if (efl_isa(old_parent, ELM_WIDGET_CLASS)) 520 if (efl_isa(old_parent, EFL_UI_WIDGET_CLASS))
521 { 521 {
522 //emit signal and focus eval old and new 522 //emit signal and focus eval old and new
523 ELM_WIDGET_DATA_GET(old_parent, old_pd); 523 ELM_WIDGET_DATA_GET(old_parent, old_pd);
524 _full_eval(old_parent, old_pd); 524 _full_eval(old_parent, old_pd);
525 } 525 }
526 526
527 if (efl_isa(pd->logical.parent, ELM_WIDGET_CLASS)) 527 if (efl_isa(pd->logical.parent, EFL_UI_WIDGET_CLASS))
528 { 528 {
529 ELM_WIDGET_DATA_GET(pd->logical.parent, new_pd); 529 ELM_WIDGET_DATA_GET(pd->logical.parent, new_pd);
530 _full_eval(pd->logical.parent, new_pd); 530 _full_eval(pd->logical.parent, new_pd);
@@ -702,7 +702,7 @@ _obj_mouse_in(void *data,
702} 702}
703 703
704EOLIAN static void 704EOLIAN static void
705_elm_widget_efl_canvas_group_group_add(Eo *obj, Elm_Widget_Smart_Data *priv) 705_efl_ui_widget_efl_canvas_group_group_add(Eo *obj, Elm_Widget_Smart_Data *priv)
706{ 706{
707 707
708 priv->obj = obj; 708 priv->obj = obj;
@@ -725,7 +725,7 @@ _elm_widget_efl_canvas_group_group_add(Eo *obj, Elm_Widget_Smart_Data *priv)
725} 725}
726 726
727EOLIAN static void 727EOLIAN static void
728_elm_widget_efl_canvas_group_group_del(Eo *obj, Elm_Widget_Smart_Data *sd) 728_efl_ui_widget_efl_canvas_group_group_del(Eo *obj, Elm_Widget_Smart_Data *sd)
729{ 729{
730 Evas_Object *sobj; 730 Evas_Object *sobj;
731 Elm_Translate_String_Data *ts; 731 Elm_Translate_String_Data *ts;
@@ -801,7 +801,7 @@ _smart_reconfigure(Elm_Widget_Smart_Data *sd)
801} 801}
802 802
803EOLIAN static void 803EOLIAN static void
804_elm_widget_efl_gfx_position_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Eina_Position2D pos) 804_efl_ui_widget_efl_gfx_position_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Eina_Position2D pos)
805{ 805{
806 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y)) 806 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y))
807 return; 807 return;
@@ -814,7 +814,7 @@ _elm_widget_efl_gfx_position_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd,
814} 814}
815 815
816EOLIAN static void 816EOLIAN static void
817_elm_widget_efl_gfx_size_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Eina_Size2D sz) 817_efl_ui_widget_efl_gfx_size_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Eina_Size2D sz)
818{ 818{
819 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h)) 819 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h))
820 return; 820 return;
@@ -838,15 +838,15 @@ _full_eval_children(Eo *obj, Elm_Widget_Smart_Data *sd)
838 { 838 {
839 Elm_Widget_Smart_Data *sd_child; 839 Elm_Widget_Smart_Data *sd_child;
840 840
841 if (!efl_isa(child, ELM_WIDGET_CLASS)) continue; 841 if (!efl_isa(child, EFL_UI_WIDGET_CLASS)) continue;
842 842
843 sd_child = efl_data_scope_get(child, ELM_WIDGET_CLASS); 843 sd_child = efl_data_scope_get(child, EFL_UI_WIDGET_CLASS);
844 _full_eval_children(child, sd_child); 844 _full_eval_children(child, sd_child);
845 } 845 }
846} 846}
847 847
848EOLIAN static void 848EOLIAN static void
849_elm_widget_efl_gfx_visible_set(Eo *obj, Elm_Widget_Smart_Data *pd, Eina_Bool vis) 849_efl_ui_widget_efl_gfx_visible_set(Eo *obj, Elm_Widget_Smart_Data *pd, Eina_Bool vis)
850{ 850{
851 Eina_Iterator *it; 851 Eina_Iterator *it;
852 Evas_Object *o; 852 Evas_Object *o;
@@ -886,7 +886,7 @@ _elm_widget_efl_gfx_visible_set(Eo *obj, Elm_Widget_Smart_Data *pd, Eina_Bool vi
886} 886}
887 887
888EOLIAN static void 888EOLIAN static void
889_elm_widget_efl_gfx_color_color_set(Eo *obj, Elm_Widget_Smart_Data *pd, int r, int g, int b, int a) 889_efl_ui_widget_efl_gfx_color_color_set(Eo *obj, Elm_Widget_Smart_Data *pd, int r, int g, int b, int a)
890{ 890{
891 Eina_Iterator *it; 891 Eina_Iterator *it;
892 Evas_Object *o; 892 Evas_Object *o;
@@ -905,7 +905,7 @@ _elm_widget_efl_gfx_color_color_set(Eo *obj, Elm_Widget_Smart_Data *pd, int r, i
905} 905}
906 906
907EOLIAN static void 907EOLIAN static void
908_elm_widget_efl_canvas_object_no_render_set(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Eina_Bool hide) 908_efl_ui_widget_efl_canvas_object_no_render_set(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Eina_Bool hide)
909{ 909{
910 Eina_Iterator *it; 910 Eina_Iterator *it;
911 Evas_Object *o; 911 Evas_Object *o;
@@ -927,7 +927,7 @@ _elm_widget_efl_canvas_object_no_render_set(Eo *obj, Elm_Widget_Smart_Data *_pd
927} 927}
928 928
929EOLIAN static void 929EOLIAN static void
930_elm_widget_efl_canvas_object_is_frame_object_set(Eo *obj, Elm_Widget_Smart_Data *pd, Eina_Bool frame) 930_efl_ui_widget_efl_canvas_object_is_frame_object_set(Eo *obj, Elm_Widget_Smart_Data *pd, Eina_Bool frame)
931{ 931{
932 Evas_Object *o; 932 Evas_Object *o;
933 Eina_List *li; 933 Eina_List *li;
@@ -942,7 +942,7 @@ _elm_widget_efl_canvas_object_is_frame_object_set(Eo *obj, Elm_Widget_Smart_Data
942} 942}
943 943
944EOLIAN static void 944EOLIAN static void
945_elm_widget_efl_canvas_object_clip_set(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Evas_Object *clip) 945_efl_ui_widget_efl_canvas_object_clip_set(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Evas_Object *clip)
946{ 946{
947 Eina_Iterator *it; 947 Eina_Iterator *it;
948 Evas_Object *o; 948 Evas_Object *o;
@@ -962,13 +962,13 @@ _elm_widget_efl_canvas_object_clip_set(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_
962} 962}
963 963
964EOLIAN static void 964EOLIAN static void
965_elm_widget_efl_canvas_group_group_calculate(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED) 965_efl_ui_widget_efl_canvas_group_group_calculate(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED)
966{ 966{
967 /* a NO-OP, on the base */ 967 /* a NO-OP, on the base */
968} 968}
969 969
970EOLIAN static void 970EOLIAN static void
971_elm_widget_efl_canvas_group_group_member_add(Eo *obj, Elm_Widget_Smart_Data *pd, Evas_Object *child) 971_efl_ui_widget_efl_canvas_group_group_member_add(Eo *obj, Elm_Widget_Smart_Data *pd, Evas_Object *child)
972{ 972{
973 int r, g, b, a; 973 int r, g, b, a;
974 efl_canvas_group_member_add(efl_super(obj, MY_CLASS), child); 974 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
991} 991}
992 992
993EOLIAN static void 993EOLIAN static void
994_elm_widget_efl_canvas_group_group_member_del(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Evas_Object *child) 994_efl_ui_widget_efl_canvas_group_group_member_del(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Evas_Object *child)
995{ 995{
996 if (!evas_object_data_get(child, "_elm_leaveme")) 996 if (!evas_object_data_get(child, "_elm_leaveme"))
997 evas_object_clip_unset(child); 997 evas_object_clip_unset(child);
@@ -1142,7 +1142,7 @@ elm_widget_focus_region_show(Eo *obj)
1142} 1142}
1143 1143
1144EOLIAN static void 1144EOLIAN static void
1145_elm_widget_widget_parent_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Evas_Object *parent EINA_UNUSED) 1145_efl_ui_widget_widget_parent_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Evas_Object *parent EINA_UNUSED)
1146{ 1146{
1147} 1147}
1148 1148
@@ -1179,7 +1179,7 @@ elm_widget_access(Evas_Object *obj,
1179} 1179}
1180 1180
1181EOLIAN static void 1181EOLIAN static void
1182_elm_widget_on_access_update(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Eina_Bool is_access EINA_UNUSED) 1182_efl_ui_widget_on_access_update(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Eina_Bool is_access EINA_UNUSED)
1183{ 1183{
1184} 1184}
1185 1185
@@ -1256,7 +1256,7 @@ elm_widget_theme_specific(Evas_Object *obj,
1256} 1256}
1257 1257
1258EOLIAN static Efl_Ui_Theme_Apply 1258EOLIAN static Efl_Ui_Theme_Apply
1259_elm_widget_theme_apply(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED) 1259_efl_ui_widget_theme_apply(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED)
1260{ 1260{
1261 _elm_widget_mirrored_reload(obj); 1261 _elm_widget_mirrored_reload(obj);
1262 if (elm_widget_disabled_get(obj)) 1262 if (elm_widget_disabled_get(obj))
@@ -1275,7 +1275,7 @@ _elm_widget_theme_apply(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED)
1275 * 1275 *
1276 **/ 1276 **/
1277EOLIAN static Eina_Bool 1277EOLIAN static Eina_Bool
1278_elm_widget_efl_ui_base_mirrored_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) 1278_efl_ui_widget_efl_ui_base_mirrored_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd)
1279{ 1279{
1280 return sd->is_mirrored; 1280 return sd->is_mirrored;
1281} 1281}
@@ -1289,7 +1289,7 @@ _elm_widget_efl_ui_base_mirrored_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data
1289 * @param mirrored EINA_TRUE to set mirrored mode. EINA_FALSE to unset. 1289 * @param mirrored EINA_TRUE to set mirrored mode. EINA_FALSE to unset.
1290 */ 1290 */
1291EOLIAN static void 1291EOLIAN static void
1292_elm_widget_efl_ui_base_mirrored_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool mirrored) 1292_efl_ui_widget_efl_ui_base_mirrored_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool mirrored)
1293{ 1293{
1294 mirrored = !!mirrored; 1294 mirrored = !!mirrored;
1295 1295
@@ -1307,7 +1307,7 @@ _elm_widget_efl_ui_base_mirrored_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bo
1307 * 1307 *
1308 **/ 1308 **/
1309EOLIAN static Eina_Bool 1309EOLIAN static Eina_Bool
1310_elm_widget_efl_ui_base_mirrored_automatic_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) 1310_efl_ui_widget_efl_ui_base_mirrored_automatic_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd)
1311{ 1311{
1312 return sd->mirrored_auto_mode; 1312 return sd->mirrored_auto_mode;
1313} 1313}
@@ -1322,7 +1322,7 @@ _elm_widget_efl_ui_base_mirrored_automatic_get(Eo *obj EINA_UNUSED, Elm_Widget_S
1322 * @param automatic EINA_TRUE for auto mirrored mode. EINA_FALSE for manual. 1322 * @param automatic EINA_TRUE for auto mirrored mode. EINA_FALSE for manual.
1323 */ 1323 */
1324EOLIAN static void 1324EOLIAN static void
1325_elm_widget_efl_ui_base_mirrored_automatic_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool automatic) 1325_efl_ui_widget_efl_ui_base_mirrored_automatic_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool automatic)
1326{ 1326{
1327 if (sd->mirrored_auto_mode != automatic) 1327 if (sd->mirrored_auto_mode != automatic)
1328 { 1328 {
@@ -1336,7 +1336,7 @@ _elm_widget_efl_ui_base_mirrored_automatic_set(Eo *obj, Elm_Widget_Smart_Data *s
1336} 1336}
1337 1337
1338EOLIAN static void 1338EOLIAN static void
1339_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) 1339_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)
1340{ 1340{
1341 if ((sd->on_show_region_data == data) && (sd->on_show_region == func)) 1341 if ((sd->on_show_region_data == data) && (sd->on_show_region == func))
1342 return; 1342 return;
@@ -1362,7 +1362,7 @@ elm_widget_sub_object_parent_add(Evas_Object *sobj)
1362 Eo *parent = NULL; 1362 Eo *parent = NULL;
1363 1363
1364 parent = efl_parent_get(sobj); 1364 parent = efl_parent_get(sobj);
1365 if (!efl_isa(parent, ELM_WIDGET_CLASS)) 1365 if (!efl_isa(parent, EFL_UI_WIDGET_CLASS))
1366 { 1366 {
1367 ERR("You passed a wrong parent parameter (%p %s). " 1367 ERR("You passed a wrong parent parameter (%p %s). "
1368 "Elementary widget's parent should be an elementary widget.", parent, evas_object_type_get(parent)); 1368 "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)
1386 * @see elm_widget_sub_object_parent_add() 1386 * @see elm_widget_sub_object_parent_add()
1387 */ 1387 */
1388EOLIAN static Eina_Bool 1388EOLIAN static Eina_Bool
1389_elm_widget_widget_sub_object_add(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Object *sobj) 1389_efl_ui_widget_widget_sub_object_add(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Object *sobj)
1390{ 1390{
1391 Eina_Bool mirrored, pmirrored = efl_ui_mirrored_get(obj); 1391 Eina_Bool mirrored, pmirrored = efl_ui_mirrored_get(obj);
1392 1392
@@ -1507,7 +1507,7 @@ end:
1507} 1507}
1508 1508
1509EOLIAN static Eina_Bool 1509EOLIAN static Eina_Bool
1510_elm_widget_widget_sub_object_del(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Object *sobj) 1510_efl_ui_widget_widget_sub_object_del(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Object *sobj)
1511{ 1511{
1512 Evas_Object *sobj_parent; 1512 Evas_Object *sobj_parent;
1513 1513
@@ -1596,7 +1596,7 @@ _elm_widget_widget_sub_object_del(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Objec
1596 1596
1597/* protected function - for widget developers only */ 1597/* protected function - for widget developers only */
1598EOLIAN static void 1598EOLIAN static void
1599_elm_widget_resize_object_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eo *sobj) 1599_efl_ui_widget_resize_object_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eo *sobj)
1600{ 1600{
1601 Evas_Object *parent; 1601 Evas_Object *parent;
1602 1602
@@ -1666,7 +1666,7 @@ elm_widget_hover_object_set(Eo *obj, Evas_Object *sobj)
1666} 1666}
1667 1667
1668EOLIAN static void 1668EOLIAN static void
1669_elm_widget_focus_allow_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool can_focus) 1669_efl_ui_widget_focus_allow_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool can_focus)
1670{ 1670{
1671 can_focus = !!can_focus; 1671 can_focus = !!can_focus;
1672 1672
@@ -1720,7 +1720,7 @@ _elm_widget_focus_allow_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool can_fo
1720} 1720}
1721 1721
1722EOLIAN static Eina_Bool 1722EOLIAN static Eina_Bool
1723_elm_widget_focus_allow_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) 1723_efl_ui_widget_focus_allow_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd)
1724{ 1724{
1725 return sd->can_focus; 1725 return sd->can_focus;
1726} 1726}
@@ -1907,12 +1907,12 @@ elm_widget_highlight_get(const Eo *obj)
1907} 1907}
1908 1908
1909EOLIAN static Evas_Object* 1909EOLIAN static Evas_Object*
1910_elm_widget_widget_top_get(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED) 1910_efl_ui_widget_widget_top_get(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED)
1911{ 1911{
1912 Elm_Widget *parent = elm_widget_parent_get(obj); 1912 Efl_Ui_Widget *parent = elm_widget_parent_get(obj);
1913 if (parent) 1913 if (parent)
1914 { 1914 {
1915 if (!efl_isa(parent, ELM_WIDGET_CLASS)) return NULL; 1915 if (!efl_isa(parent, EFL_UI_WIDGET_CLASS)) return NULL;
1916 return efl_ui_widget_top_get(parent); 1916 return efl_ui_widget_top_get(parent);
1917 } 1917 }
1918 return obj; 1918 return obj;
@@ -2360,7 +2360,7 @@ elm_widget_parent_highlight_set(Eo *obj, Eina_Bool highlighted)
2360} 2360}
2361 2361
2362EOLIAN static Evas_Object* 2362EOLIAN static Evas_Object*
2363_elm_widget_widget_parent_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) 2363_efl_ui_widget_widget_parent_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd)
2364{ 2364{
2365 return sd->parent_obj; 2365 return sd->parent_obj;
2366} 2366}
@@ -2427,7 +2427,7 @@ elm_widget_disabled_internal(Eo *obj, Eina_Bool disabled)
2427} 2427}
2428 2428
2429EOLIAN static void 2429EOLIAN static void
2430_elm_widget_disabled_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool disabled) 2430_efl_ui_widget_disabled_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool disabled)
2431{ 2431{
2432 if (sd->disabled == disabled) return; 2432 if (sd->disabled == disabled) return;
2433 sd->disabled = !!disabled; 2433 sd->disabled = !!disabled;
@@ -2439,14 +2439,14 @@ _elm_widget_disabled_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool disabled)
2439} 2439}
2440 2440
2441EOLIAN static Eina_Bool 2441EOLIAN static Eina_Bool
2442_elm_widget_disabled_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) 2442_efl_ui_widget_disabled_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd)
2443{ 2443{
2444 if (sd->disabled) return EINA_TRUE; 2444 if (sd->disabled) return EINA_TRUE;
2445 return elm_widget_disabled_get(elm_widget_parent_get(obj)); 2445 return elm_widget_disabled_get(elm_widget_parent_get(obj));
2446} 2446}
2447 2447
2448EOLIAN static void 2448EOLIAN static void
2449_elm_widget_show_region_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Rect sr, Eina_Bool forceshow) 2449_efl_ui_widget_show_region_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Rect sr, Eina_Bool forceshow)
2450{ 2450{
2451 Evas_Object *parent_obj, *child_obj; 2451 Evas_Object *parent_obj, *child_obj;
2452 Evas_Coord px, py, cx, cy, nx = 0, ny = 0; 2452 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
2490} 2490}
2491 2491
2492EOLIAN static Eina_Rect 2492EOLIAN static Eina_Rect
2493_elm_widget_show_region_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) 2493_efl_ui_widget_show_region_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd)
2494{ 2494{
2495 return (Eina_Rect) sd->show_region; 2495 return (Eina_Rect) sd->show_region;
2496} 2496}
@@ -2514,7 +2514,7 @@ _elm_widget_show_region_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd)
2514 * @ingroup Widget 2514 * @ingroup Widget
2515 */ 2515 */
2516EOLIAN static Eina_Rect 2516EOLIAN static Eina_Rect
2517_elm_widget_interest_region_get(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED) 2517_efl_ui_widget_interest_region_get(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED)
2518{ 2518{
2519 Eina_Rect r = {}; 2519 Eina_Rect r = {};
2520 r.size = efl_gfx_size_get(obj); 2520 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)
2522} 2522}
2523 2523
2524EOLIAN static void 2524EOLIAN static void
2525_elm_widget_scroll_hold_push(Eo *obj, Elm_Widget_Smart_Data *sd) 2525_efl_ui_widget_scroll_hold_push(Eo *obj, Elm_Widget_Smart_Data *sd)
2526{ 2526{
2527 sd->scroll_hold++; 2527 sd->scroll_hold++;
2528 if (sd->scroll_hold == 1) 2528 if (sd->scroll_hold == 1)
@@ -2546,7 +2546,7 @@ _elm_widget_scroll_hold_push(Eo *obj, Elm_Widget_Smart_Data *sd)
2546} 2546}
2547 2547
2548EOLIAN static void 2548EOLIAN static void
2549_elm_widget_scroll_hold_pop(Eo *obj, Elm_Widget_Smart_Data *sd) 2549_efl_ui_widget_scroll_hold_pop(Eo *obj, Elm_Widget_Smart_Data *sd)
2550{ 2550{
2551 sd->scroll_hold--; 2551 sd->scroll_hold--;
2552 if (!sd->scroll_hold) 2552 if (!sd->scroll_hold)
@@ -2579,7 +2579,7 @@ elm_widget_scroll_hold_get(const Eo *obj)
2579} 2579}
2580 2580
2581EOLIAN static void 2581EOLIAN static void
2582_elm_widget_scroll_freeze_push(Eo *obj, Elm_Widget_Smart_Data *sd) 2582_efl_ui_widget_scroll_freeze_push(Eo *obj, Elm_Widget_Smart_Data *sd)
2583{ 2583{
2584 sd->scroll_freeze++; 2584 sd->scroll_freeze++;
2585 if (sd->scroll_freeze == 1) 2585 if (sd->scroll_freeze == 1)
@@ -2603,7 +2603,7 @@ _elm_widget_scroll_freeze_push(Eo *obj, Elm_Widget_Smart_Data *sd)
2603} 2603}
2604 2604
2605EOLIAN static void 2605EOLIAN static void
2606_elm_widget_scroll_freeze_pop(Eo *obj, Elm_Widget_Smart_Data *sd) 2606_efl_ui_widget_scroll_freeze_pop(Eo *obj, Elm_Widget_Smart_Data *sd)
2607{ 2607{
2608 sd->scroll_freeze--; 2608 sd->scroll_freeze--;
2609 if (!sd->scroll_freeze) 2609 if (!sd->scroll_freeze)
@@ -2636,7 +2636,7 @@ elm_widget_scroll_freeze_get(const Eo *obj)
2636} 2636}
2637 2637
2638EOLIAN static void 2638EOLIAN static void
2639_elm_widget_efl_gfx_scale_set(Eo *obj, Elm_Widget_Smart_Data *sd, double scale) 2639_efl_ui_widget_efl_gfx_scale_set(Eo *obj, Elm_Widget_Smart_Data *sd, double scale)
2640{ 2640{
2641 if (scale < 0.0) scale = 0.0; 2641 if (scale < 0.0) scale = 0.0;
2642 if (sd->scale != scale) 2642 if (sd->scale != scale)
@@ -2647,7 +2647,7 @@ _elm_widget_efl_gfx_scale_set(Eo *obj, Elm_Widget_Smart_Data *sd, double scale)
2647} 2647}
2648 2648
2649EOLIAN static double 2649EOLIAN static double
2650_elm_widget_efl_gfx_scale_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) 2650_efl_ui_widget_efl_gfx_scale_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd)
2651{ 2651{
2652 // FIXME: save walking up the tree by storing/caching parent scale 2652 // FIXME: save walking up the tree by storing/caching parent scale
2653 if (sd->scale == 0.0) 2653 if (sd->scale == 0.0)
@@ -2841,7 +2841,7 @@ elm_widget_part_translatable_text_get(const Eo *obj, const char *part, const cha
2841} 2841}
2842 2842
2843EOLIAN static void 2843EOLIAN static void
2844_elm_widget_efl_ui_translatable_translation_update(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) 2844_efl_ui_widget_efl_ui_translatable_translation_update(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd)
2845{ 2845{
2846 const Eina_List *l; 2846 const Eina_List *l;
2847 Evas_Object *child; 2847 Evas_Object *child;
@@ -2869,13 +2869,13 @@ _elm_widget_efl_ui_translatable_translation_update(Eo *obj EINA_UNUSED, Elm_Widg
2869} 2869}
2870 2870
2871EOLIAN static void 2871EOLIAN static void
2872_elm_widget_access_info_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, const char *txt) 2872_efl_ui_widget_access_info_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, const char *txt)
2873{ 2873{
2874 eina_stringshare_replace(&sd->access_info, txt); 2874 eina_stringshare_replace(&sd->access_info, txt);
2875} 2875}
2876 2876
2877EOLIAN static const char* 2877EOLIAN static const char*
2878_elm_widget_access_info_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) 2878_efl_ui_widget_access_info_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd)
2879{ 2879{
2880 return sd->access_info; 2880 return sd->access_info;
2881} 2881}
@@ -2895,7 +2895,7 @@ elm_widget_theme_get(const Evas_Object *obj)
2895} 2895}
2896 2896
2897EOLIAN static Efl_Ui_Theme_Apply 2897EOLIAN static Efl_Ui_Theme_Apply
2898_elm_widget_style_set(Eo *obj, Elm_Widget_Smart_Data *sd, const char *style) 2898_efl_ui_widget_style_set(Eo *obj, Elm_Widget_Smart_Data *sd, const char *style)
2899{ 2899{
2900 if (!elm_widget_is_legacy(obj) && efl_finalized_get(obj)) 2900 if (!elm_widget_is_legacy(obj) && efl_finalized_get(obj))
2901 { 2901 {
@@ -2910,7 +2910,7 @@ _elm_widget_style_set(Eo *obj, Elm_Widget_Smart_Data *sd, const char *style)
2910} 2910}
2911 2911
2912EOLIAN static const char* 2912EOLIAN static const char*
2913_elm_widget_style_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) 2913_efl_ui_widget_style_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd)
2914{ 2914{
2915 const char *ret; 2915 const char *ret;
2916 ret = "default"; 2916 ret = "default";
@@ -3050,7 +3050,7 @@ _convert(Efl_Dbg_Info *info, Eina_Iterator *ptr_list)
3050} 3050}
3051 3051
3052EOLIAN static void 3052EOLIAN static void
3053_elm_widget_efl_object_dbg_info_get(Eo *eo_obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Efl_Dbg_Info *root) 3053_efl_ui_widget_efl_object_dbg_info_get(Eo *eo_obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Efl_Dbg_Info *root)
3054{ 3054{
3055 efl_dbg_info_get(efl_super(eo_obj, MY_CLASS), root); 3055 efl_dbg_info_get(efl_super(eo_obj, MY_CLASS), root);
3056 Efl_Ui_Focus_Relations *rel = NULL; 3056 Efl_Ui_Focus_Relations *rel = NULL;
@@ -3339,7 +3339,7 @@ elm_widget_focus_highlight_focus_part_geometry_get(const Evas_Object *obj,
3339} 3339}
3340 3340
3341EOLIAN static Eina_Rect 3341EOLIAN static Eina_Rect
3342_elm_widget_focus_highlight_geometry_get(Eo *obj, Elm_Widget_Smart_Data *sd) 3342_efl_ui_widget_focus_highlight_geometry_get(Eo *obj, Elm_Widget_Smart_Data *sd)
3343{ 3343{
3344 Evas_Coord ox = 0, oy = 0, ow = 0, oh = 0; 3344 Evas_Coord ox = 0, oy = 0, ow = 0, oh = 0;
3345 Evas_Object *scroller = (Evas_Object *)obj; 3345 Evas_Object *scroller = (Evas_Object *)obj;
@@ -3375,19 +3375,19 @@ _elm_widget_focus_highlight_geometry_get(Eo *obj, Elm_Widget_Smart_Data *sd)
3375} 3375}
3376 3376
3377EOLIAN static Elm_Object_Item* 3377EOLIAN static Elm_Object_Item*
3378_elm_widget_focused_item_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED) 3378_efl_ui_widget_focused_item_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED)
3379{ 3379{
3380 return NULL; 3380 return NULL;
3381} 3381}
3382 3382
3383EOLIAN static void 3383EOLIAN static void
3384_elm_widget_interest_region_mode_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd, Elm_Focus_Region_Show_Mode mode) 3384_efl_ui_widget_interest_region_mode_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd, Elm_Focus_Region_Show_Mode mode)
3385{ 3385{
3386 _pd->focus_region_show_mode = mode; 3386 _pd->focus_region_show_mode = mode;
3387} 3387}
3388 3388
3389EOLIAN static Elm_Focus_Region_Show_Mode 3389EOLIAN static Elm_Focus_Region_Show_Mode
3390_elm_widget_interest_region_mode_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd) 3390_efl_ui_widget_interest_region_mode_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd)
3391{ 3391{
3392 return _pd->focus_region_show_mode; 3392 return _pd->focus_region_show_mode;
3393} 3393}
@@ -3451,7 +3451,7 @@ elm_widget_display_mode_set(Evas_Object *obj, Evas_Display_Mode dispmode)
3451} 3451}
3452 3452
3453EOLIAN static void 3453EOLIAN static void
3454_elm_widget_orientation_mode_disabled_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool disabled) 3454_efl_ui_widget_orientation_mode_disabled_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool disabled)
3455{ 3455{
3456 int orient_mode = -1; 3456 int orient_mode = -1;
3457 3457
@@ -3467,14 +3467,14 @@ _elm_widget_orientation_mode_disabled_set(Eo *obj, Elm_Widget_Smart_Data *sd, Ei
3467} 3467}
3468 3468
3469EOLIAN static Eina_Bool 3469EOLIAN static Eina_Bool
3470_elm_widget_orientation_mode_disabled_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) 3470_efl_ui_widget_orientation_mode_disabled_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd)
3471{ 3471{
3472 if (sd->orient_mode == -1) return EINA_TRUE; 3472 if (sd->orient_mode == -1) return EINA_TRUE;
3473 else return EINA_FALSE; 3473 else return EINA_FALSE;
3474} 3474}
3475 3475
3476EOLIAN static void 3476EOLIAN static void
3477_elm_widget_on_orientation_update(Eo *obj, Elm_Widget_Smart_Data *sd, int orient_mode) 3477_efl_ui_widget_on_orientation_update(Eo *obj, Elm_Widget_Smart_Data *sd, int orient_mode)
3478{ 3478{
3479 Evas_Object *child; 3479 Evas_Object *child;
3480 Eina_List *l; 3480 Eina_List *l;
@@ -3505,7 +3505,7 @@ _elm_widget_on_orientation_update(Eo *obj, Elm_Widget_Smart_Data *sd, int orient
3505 * 3505 *
3506 **/ 3506 **/
3507EOLIAN static Elm_Focus_Move_Policy 3507EOLIAN static Elm_Focus_Move_Policy
3508_elm_widget_focus_move_policy_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) 3508_efl_ui_widget_focus_move_policy_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd)
3509{ 3509{
3510 return sd->focus_move_policy; 3510 return sd->focus_move_policy;
3511} 3511}
@@ -3520,7 +3520,7 @@ _elm_widget_focus_move_policy_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd
3520 */ 3520 */
3521 3521
3522EOLIAN static void 3522EOLIAN static void
3523_elm_widget_focus_move_policy_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Elm_Focus_Move_Policy policy) 3523_efl_ui_widget_focus_move_policy_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Elm_Focus_Move_Policy policy)
3524{ 3524{
3525 if (sd->focus_move_policy == policy) return; 3525 if (sd->focus_move_policy == policy) return;
3526 sd->focus_move_policy = policy; 3526 sd->focus_move_policy = policy;
@@ -3534,7 +3534,7 @@ _elm_widget_focus_move_policy_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd
3534 * 3534 *
3535 **/ 3535 **/
3536EOLIAN static Eina_Bool 3536EOLIAN static Eina_Bool
3537_elm_widget_focus_move_policy_automatic_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) 3537_efl_ui_widget_focus_move_policy_automatic_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd)
3538{ 3538{
3539 return sd->focus_move_policy_auto_mode; 3539 return sd->focus_move_policy_auto_mode;
3540} 3540}
@@ -3549,7 +3549,7 @@ _elm_widget_focus_move_policy_automatic_get(Eo *obj EINA_UNUSED, Elm_Widget_Smar
3549 * @param automatic EINA_TRUE for auto focus_move_policy mode. EINA_FALSE for manual. 3549 * @param automatic EINA_TRUE for auto focus_move_policy mode. EINA_FALSE for manual.
3550 */ 3550 */
3551EOLIAN static void 3551EOLIAN static void
3552_elm_widget_focus_move_policy_automatic_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool automatic) 3552_efl_ui_widget_focus_move_policy_automatic_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool automatic)
3553{ 3553{
3554 if (sd->focus_move_policy_auto_mode != automatic) 3554 if (sd->focus_move_policy_auto_mode != automatic)
3555 { 3555 {
@@ -3679,7 +3679,7 @@ elm_widget_element_update(Evas_Object *obj, Evas_Object *component, const char *
3679 group = eina_stringshare_add(name); 3679 group = eina_stringshare_add(name);
3680 else 3680 else
3681 group = eina_stringshare_printf("%s/%s", elm_widget_theme_element_get(obj), name); 3681 group = eina_stringshare_printf("%s/%s", elm_widget_theme_element_get(obj), name);
3682 if (efl_isa(component, ELM_WIDGET_CLASS)) 3682 if (efl_isa(component, EFL_UI_WIDGET_CLASS))
3683 { 3683 {
3684 changed |= elm_widget_theme_klass_set(component, elm_widget_theme_klass_get(obj)); 3684 changed |= elm_widget_theme_klass_set(component, elm_widget_theme_klass_get(obj));
3685 changed |= elm_widget_theme_element_set(component, (const char *)group); 3685 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)
5152} 5152}
5153 5153
5154EOLIAN static Eo * 5154EOLIAN static Eo *
5155_elm_widget_efl_object_constructor(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED) 5155_efl_ui_widget_efl_object_constructor(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED)
5156{ 5156{
5157 Eo *parent = NULL; 5157 Eo *parent = NULL;
5158 5158
@@ -5178,7 +5178,7 @@ _elm_widget_efl_object_constructor(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSE
5178} 5178}
5179 5179
5180EOLIAN static Efl_Object* 5180EOLIAN static Efl_Object*
5181_elm_widget_efl_object_finalize(Eo *obj, Elm_Widget_Smart_Data *pd) 5181_efl_ui_widget_efl_object_finalize(Eo *obj, Elm_Widget_Smart_Data *pd)
5182{ 5182{
5183 Eo *eo; 5183 Eo *eo;
5184 5184
@@ -5191,7 +5191,7 @@ _elm_widget_efl_object_finalize(Eo *obj, Elm_Widget_Smart_Data *pd)
5191 5191
5192 5192
5193EOLIAN static void 5193EOLIAN static void
5194_elm_widget_efl_object_destructor(Eo *obj, Elm_Widget_Smart_Data *sd) 5194_efl_ui_widget_efl_object_destructor(Eo *obj, Elm_Widget_Smart_Data *sd)
5195{ 5195{
5196 if (sd->manager.provider) 5196 if (sd->manager.provider)
5197 { 5197 {
@@ -5207,13 +5207,13 @@ _elm_widget_efl_object_destructor(Eo *obj, Elm_Widget_Smart_Data *sd)
5207 } 5207 }
5208 5208
5209 sd->on_destroy = EINA_TRUE; 5209 sd->on_destroy = EINA_TRUE;
5210 efl_destructor(efl_super(obj, ELM_WIDGET_CLASS)); 5210 efl_destructor(efl_super(obj, EFL_UI_WIDGET_CLASS));
5211 sd->on_destroy = EINA_FALSE; 5211 sd->on_destroy = EINA_FALSE;
5212} 5212}
5213 5213
5214/* internal eo */ 5214/* internal eo */
5215static void 5215static void
5216_elm_widget_legacy_ctor(Eo *obj, Elm_Widget_Smart_Data *sd) 5216_efl_ui_widget_legacy_ctor(Eo *obj, Elm_Widget_Smart_Data *sd)
5217{ 5217{
5218 efl_canvas_object_legacy_ctor(efl_super(obj, MY_CLASS)); 5218 efl_canvas_object_legacy_ctor(efl_super(obj, MY_CLASS));
5219 sd->legacy = EINA_TRUE; 5219 sd->legacy = EINA_TRUE;
@@ -5221,7 +5221,7 @@ _elm_widget_legacy_ctor(Eo *obj, Elm_Widget_Smart_Data *sd)
5221} 5221}
5222 5222
5223EOLIAN static void 5223EOLIAN static void
5224_elm_widget_efl_object_debug_name_override(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED, Eina_Strbuf *sb) 5224_efl_ui_widget_efl_object_debug_name_override(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED, Eina_Strbuf *sb)
5225{ 5225{
5226 const char *focus = ""; 5226 const char *focus = "";
5227 5227
@@ -5231,7 +5231,7 @@ _elm_widget_efl_object_debug_name_override(Eo *obj, Elm_Widget_Smart_Data *sd EI
5231} 5231}
5232 5232
5233EOLIAN static Eina_Bool 5233EOLIAN static Eina_Bool
5234_elm_widget_on_focus_update(Eo *obj, Elm_Widget_Smart_Data *sd, Elm_Object_Item *item EINA_UNUSED) 5234_efl_ui_widget_on_focus_update(Eo *obj, Elm_Widget_Smart_Data *sd, Elm_Object_Item *item EINA_UNUSED)
5235{ 5235{
5236 Eina_Bool focused; 5236 Eina_Bool focused;
5237 5237
@@ -5250,19 +5250,19 @@ _elm_widget_on_focus_update(Eo *obj, Elm_Widget_Smart_Data *sd, Elm_Object_Item
5250} 5250}
5251 5251
5252EOLIAN static Eina_Bool 5252EOLIAN static Eina_Bool
5253_elm_widget_on_disabled_update(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Eina_Bool disabled EINA_UNUSED) 5253_efl_ui_widget_on_disabled_update(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Eina_Bool disabled EINA_UNUSED)
5254{ 5254{
5255 return EINA_FALSE; 5255 return EINA_FALSE;
5256} 5256}
5257 5257
5258EOLIAN static Eina_Bool 5258EOLIAN static Eina_Bool
5259_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) 5259_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)
5260{ 5260{
5261 return EINA_FALSE; 5261 return EINA_FALSE;
5262} 5262}
5263 5263
5264EOLIAN static Eina_Bool 5264EOLIAN static Eina_Bool
5265_elm_widget_on_access_activate(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Efl_Ui_Activate act EINA_UNUSED) 5265_efl_ui_widget_on_access_activate(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Efl_Ui_Activate act EINA_UNUSED)
5266{ 5266{
5267 WRN("The %s widget does not implement the \"activate\" functions.", 5267 WRN("The %s widget does not implement the \"activate\" functions.",
5268 efl_class_name_get(efl_class_get(obj))); 5268 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
5270} 5270}
5271 5271
5272EOLIAN static void 5272EOLIAN static void
5273_elm_widget_class_constructor(Efl_Class *klass) 5273_efl_ui_widget_class_constructor(Efl_Class *klass)
5274{ 5274{
5275 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); 5275 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
5276} 5276}
5277 5277
5278EOLIAN static Eina_Bool 5278EOLIAN static Eina_Bool
5279_elm_widget_efl_access_component_focus_grab(Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED) 5279_efl_ui_widget_efl_access_component_focus_grab(Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED)
5280{ 5280{
5281 if (elm_object_focus_allow_get(obj)) 5281 if (elm_object_focus_allow_get(obj))
5282 { 5282 {
@@ -5290,10 +5290,10 @@ _elm_widget_efl_access_component_focus_grab(Eo *obj, Elm_Widget_Smart_Data *pd E
5290} 5290}
5291 5291
5292EOLIAN static const char* 5292EOLIAN static const char*
5293_elm_widget_efl_access_name_get(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED) 5293_efl_ui_widget_efl_access_name_get(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED)
5294{ 5294{
5295 const char *ret, *name; 5295 const char *ret, *name;
5296 name = efl_access_name_get(efl_super(obj, ELM_WIDGET_CLASS)); 5296 name = efl_access_name_get(efl_super(obj, EFL_UI_WIDGET_CLASS));
5297 5297
5298 if (name) return name; 5298 if (name) return name;
5299 5299
@@ -5304,7 +5304,7 @@ _elm_widget_efl_access_name_get(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED)
5304} 5304}
5305 5305
5306EOLIAN static Eina_List* 5306EOLIAN static Eina_List*
5307_elm_widget_efl_access_children_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd) 5307_efl_ui_widget_efl_access_children_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd)
5308{ 5308{
5309 Eina_List *l, *accs = NULL; 5309 Eina_List *l, *accs = NULL;
5310 Evas_Object *widget; 5310 Evas_Object *widget;
@@ -5329,7 +5329,7 @@ _elm_widget_efl_access_children_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *
5329} 5329}
5330 5330
5331EOLIAN static Eo* 5331EOLIAN static Eo*
5332_elm_widget_efl_access_parent_get(Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED) 5332_efl_ui_widget_efl_access_parent_get(Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED)
5333{ 5333{
5334 Efl_Access_Type type; 5334 Efl_Access_Type type;
5335 Efl_Access *parent = obj; 5335 Efl_Access *parent = obj;
@@ -5344,11 +5344,11 @@ _elm_widget_efl_access_parent_get(Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED
5344} 5344}
5345 5345
5346EOLIAN static Efl_Access_State_Set 5346EOLIAN static Efl_Access_State_Set
5347_elm_widget_efl_access_state_set_get(Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED) 5347_efl_ui_widget_efl_access_state_set_get(Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED)
5348{ 5348{
5349 Efl_Access_State_Set states = 0; 5349 Efl_Access_State_Set states = 0;
5350 5350
5351 states = efl_access_state_set_get(efl_super(obj, ELM_WIDGET_CLASS)); 5351 states = efl_access_state_set_get(efl_super(obj, EFL_UI_WIDGET_CLASS));
5352 5352
5353 if (evas_object_visible_get(obj)) 5353 if (evas_object_visible_get(obj))
5354 { 5354 {
@@ -5373,11 +5373,11 @@ _elm_widget_efl_access_state_set_get(Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNU
5373} 5373}
5374 5374
5375EOLIAN static Eina_List* 5375EOLIAN static Eina_List*
5376_elm_widget_efl_access_attributes_get(Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED) 5376_efl_ui_widget_efl_access_attributes_get(Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED)
5377{ 5377{
5378 Eina_List *attr_list = NULL; 5378 Eina_List *attr_list = NULL;
5379 5379
5380 attr_list = efl_access_attributes_get(efl_super(obj, ELM_WIDGET_CLASS)); 5380 attr_list = efl_access_attributes_get(efl_super(obj, EFL_UI_WIDGET_CLASS));
5381 5381
5382 //Add type and style information in addition. 5382 //Add type and style information in addition.
5383 Efl_Access_Attribute *attr = NULL; 5383 Efl_Access_Attribute *attr = NULL;
@@ -5470,7 +5470,7 @@ _elm_widget_item_efl_access_component_alpha_get(Eo *obj EINA_UNUSED, Elm_Widget_
5470} 5470}
5471 5471
5472EOLIAN static Efl_Object * 5472EOLIAN static Efl_Object *
5473_elm_widget_efl_object_provider_find(const Eo *obj, Elm_Widget_Smart_Data *pd, const Efl_Object *klass) 5473_efl_ui_widget_efl_object_provider_find(const Eo *obj, Elm_Widget_Smart_Data *pd, const Efl_Object *klass)
5474{ 5474{
5475 Efl_Object *lookup = NULL; 5475 Efl_Object *lookup = NULL;
5476 5476
@@ -5489,25 +5489,25 @@ _elm_widget_efl_object_provider_find(const Eo *obj, Elm_Widget_Smart_Data *pd, c
5489} 5489}
5490 5490
5491EOLIAN static Efl_Ui_Focus_Manager* 5491EOLIAN static Efl_Ui_Focus_Manager*
5492_elm_widget_efl_ui_focus_user_focus_parent_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd EINA_UNUSED) 5492_efl_ui_widget_efl_ui_focus_user_focus_parent_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd EINA_UNUSED)
5493{ 5493{
5494 return pd->focus.parent; 5494 return pd->focus.parent;
5495} 5495}
5496 5496
5497EOLIAN static Efl_Ui_Focus_Manager* 5497EOLIAN static Efl_Ui_Focus_Manager*
5498_elm_widget_efl_ui_focus_user_focus_manager_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd EINA_UNUSED) 5498_efl_ui_widget_efl_ui_focus_user_focus_manager_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd EINA_UNUSED)
5499{ 5499{
5500 return pd->focus.manager; 5500 return pd->focus.manager;
5501} 5501}
5502 5502
5503EOLIAN static Eina_Rect 5503EOLIAN static Eina_Rect
5504_elm_widget_efl_ui_focus_object_focus_geometry_get(Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED) 5504_efl_ui_widget_efl_ui_focus_object_focus_geometry_get(Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED)
5505{ 5505{
5506 return efl_gfx_geometry_get(obj); 5506 return efl_gfx_geometry_get(obj);
5507} 5507}
5508 5508
5509EOLIAN static void 5509EOLIAN static void
5510_elm_widget_efl_ui_focus_object_focus_set(Eo *obj, Elm_Widget_Smart_Data *pd, Eina_Bool focus) 5510_efl_ui_widget_efl_ui_focus_object_focus_set(Eo *obj, Elm_Widget_Smart_Data *pd, Eina_Bool focus)
5511{ 5511{
5512 pd->focused = focus; 5512 pd->focused = focus;
5513 5513
@@ -5517,7 +5517,7 @@ _elm_widget_efl_ui_focus_object_focus_set(Eo *obj, Elm_Widget_Smart_Data *pd, Ei
5517} 5517}
5518 5518
5519EOLIAN static Efl_Ui_Focus_Manager* 5519EOLIAN static Efl_Ui_Focus_Manager*
5520_elm_widget_focus_manager_create(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd EINA_UNUSED, Efl_Ui_Focus_Object *root EINA_UNUSED) 5520_efl_ui_widget_focus_manager_create(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd EINA_UNUSED, Efl_Ui_Focus_Object *root EINA_UNUSED)
5521{ 5521{
5522 ERR("No manager presented"); 5522 ERR("No manager presented");
5523 return NULL; 5523 return NULL;
@@ -5541,7 +5541,7 @@ elm_widget_content_part_set(Evas_Object *obj, const char *part, Evas_Object *con
5541 if (!efl_isa(obj, EFL_PART_INTERFACE)) return; 5541 if (!efl_isa(obj, EFL_PART_INTERFACE)) return;
5542 if (!part) 5542 if (!part)
5543 { 5543 {
5544 part = elm_widget_default_content_part_get(obj); 5544 part = efl_ui_widget_default_content_part_get(obj);
5545 if (!part) return; 5545 if (!part) return;
5546 } 5546 }
5547 efl_content_set(efl_part(obj, part), content); 5547 efl_content_set(efl_part(obj, part), content);
@@ -5556,7 +5556,7 @@ elm_widget_content_part_get(const Evas_Object *obj, const char *part)
5556 if (!efl_isa(obj, EFL_PART_INTERFACE)) return NULL; 5556 if (!efl_isa(obj, EFL_PART_INTERFACE)) return NULL;
5557 if (!part) 5557 if (!part)
5558 { 5558 {
5559 part = elm_widget_default_content_part_get(obj); 5559 part = efl_ui_widget_default_content_part_get(obj);
5560 if (!part) return NULL; 5560 if (!part) return NULL;
5561 } 5561 }
5562 return efl_content_get(efl_part(obj, part)); 5562 return efl_content_get(efl_part(obj, part));
@@ -5571,7 +5571,7 @@ elm_widget_content_part_unset(Evas_Object *obj, const char *part)
5571 if (!efl_isa(obj, EFL_PART_INTERFACE)) return NULL; 5571 if (!efl_isa(obj, EFL_PART_INTERFACE)) return NULL;
5572 if (!part) 5572 if (!part)
5573 { 5573 {
5574 part = elm_widget_default_content_part_get(obj); 5574 part = efl_ui_widget_default_content_part_get(obj);
5575 if (!part) return NULL; 5575 if (!part) return NULL;
5576 } 5576 }
5577 return efl_content_unset(efl_part(obj, part)); 5577 return efl_content_unset(efl_part(obj, part));
@@ -5739,7 +5739,7 @@ _widget_shadow_update(Widget_Shadow *ws)
5739} 5739}
5740 5740
5741static void 5741static void
5742_elm_widget_shadow_update(Elm_Widget *obj) 5742_elm_widget_shadow_update(Efl_Ui_Widget *obj)
5743{ 5743{
5744 Widget_Shadow *shadow = _widget_shadow_part_get(obj); 5744 Widget_Shadow *shadow = _widget_shadow_part_get(obj);
5745 _widget_shadow_update(shadow); 5745 _widget_shadow_update(shadow);
@@ -5890,7 +5890,7 @@ _efl_ui_widget_part_shadow_efl_gfx_filter_filter_state_get(Eo *obj, void *_pd EI
5890/* Efl.Part implementation */ 5890/* Efl.Part implementation */
5891 5891
5892EOLIAN static Efl_Object * 5892EOLIAN static Efl_Object *
5893_elm_widget_efl_part_part(const Eo *obj, Elm_Widget_Smart_Data *wd EINA_UNUSED, const char *part) 5893_efl_ui_widget_efl_part_part(const Eo *obj, Elm_Widget_Smart_Data *wd EINA_UNUSED, const char *part)
5894{ 5894{
5895 if (eina_streq(part, "background")) 5895 if (eina_streq(part, "background"))
5896 return ELM_PART_IMPLEMENT(EFL_UI_WIDGET_PART_BG_CLASS, obj, part); 5896 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)
5914/* Efl.Part Bg implementation */ 5914/* Efl.Part Bg implementation */
5915 5915
5916Efl_Canvas_Object * 5916Efl_Canvas_Object *
5917_efl_ui_widget_bg_get(Elm_Widget *obj) 5917_efl_ui_widget_bg_get(Efl_Ui_Widget *obj)
5918{ 5918{
5919 Elm_Widget_Smart_Data *sd = efl_data_scope_get(obj, MY_CLASS); 5919 Elm_Widget_Smart_Data *sd = efl_data_scope_get(obj, MY_CLASS);
5920 Evas_Object *bg_obj = sd->bg; 5920 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)
5994 5994
5995/* Internal EO APIs and hidden overrides */ 5995/* Internal EO APIs and hidden overrides */
5996 5996
5997EFL_FUNC_BODY_CONST(elm_widget_default_content_part_get, const char *, NULL) 5997EFL_FUNC_BODY_CONST(efl_ui_widget_default_content_part_get, const char *, NULL)
5998EFL_FUNC_BODY_CONST(elm_widget_default_text_part_get, const char *, NULL) 5998EFL_FUNC_BODY_CONST(efl_ui_widget_default_text_part_get, const char *, NULL)
5999 5999
6000ELM_PART_CONTENT_DEFAULT_GET(elm_widget, NULL) 6000ELM_PART_CONTENT_DEFAULT_GET(efl_ui_widget, NULL)
6001ELM_PART_TEXT_DEFAULT_GET(elm_widget, NULL) 6001ELM_PART_TEXT_DEFAULT_GET(efl_ui_widget, NULL)
6002 6002
6003#define ELM_WIDGET_EXTRA_OPS \ 6003#define EFL_UI_WIDGET_EXTRA_OPS \
6004 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_widget), \ 6004 EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_widget), \
6005 ELM_PART_CONTENT_DEFAULT_OPS(elm_widget), \ 6005 ELM_PART_CONTENT_DEFAULT_OPS(efl_ui_widget), \
6006 ELM_PART_TEXT_DEFAULT_OPS(elm_widget), \ 6006 ELM_PART_TEXT_DEFAULT_OPS(efl_ui_widget), \
6007 EFL_OBJECT_OP_FUNC(efl_canvas_object_legacy_ctor, _elm_widget_legacy_ctor), \ 6007 EFL_OBJECT_OP_FUNC(efl_canvas_object_legacy_ctor, _efl_ui_widget_legacy_ctor), \
6008 EFL_OBJECT_OP_FUNC(efl_dbg_info_get, _elm_widget_efl_object_dbg_info_get) 6008 EFL_OBJECT_OP_FUNC(efl_dbg_info_get, _efl_ui_widget_efl_object_dbg_info_get)
6009 6009
6010#include "elm_widget_item.eo.c" 6010#include "elm_widget_item.eo.c"
6011#include "elm_widget.eo.c" 6011#include "efl_ui_widget.eo.c"
6012 6012
6013/* Others */ 6013/* Others */
6014#include "efl_ui_translatable.eo.c" 6014#include "efl_ui_translatable.eo.c"
diff --git a/src/lib/elementary/elm_widget.eo b/src/lib/elementary/efl_ui_widget.eo
index a3bf4f1..f4933d4 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 {
14} 14}
15 15
16/* ATTENTION: Rename to Efl.Ui.Widget is imminent. */ 16/* ATTENTION: Rename to Efl.Ui.Widget is imminent. */
17abstract Elm.Widget (Efl.Canvas.Group, Efl.Access, 17abstract Efl.Ui.Widget (Efl.Canvas.Group, Efl.Access,
18 Efl.Access.Component, Efl.Ui.Focus.User, Efl.Part, 18 Efl.Access.Component, Efl.Ui.Focus.User, Efl.Part,
19 Efl.Ui.Focus.Object, Efl.Ui.Base, Efl.Ui.Cursor, 19 Efl.Ui.Focus.Object, Efl.Ui.Base, Efl.Ui.Cursor,
20 Efl.Ui.Translatable) 20 Efl.Ui.Translatable)
21{ 21{
22 [[Elementary widget abstract class]] 22 [[Elementary widget abstract class]]
23 legacy_prefix: elm_widget; 23 legacy_prefix: elm_widget;
24 eo_prefix: efl_ui_widget; 24 //eo_prefix: efl_ui_widget;
25 event_prefix: efl_ui_widget; 25 event_prefix: efl_ui_widget;
26 data: Efl_Ui_Widget_Data; 26 data: Efl_Ui_Widget_Data;
27 methods { 27 methods {
@@ -158,7 +158,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Efl.Access,
158 @property widget_parent @protected { 158 @property widget_parent @protected {
159 [[The internal parent of this widget. 159 [[The internal parent of this widget.
160 160
161 @Elm.Widget objects have a parent hierarchy that may differ slightly 161 @Efl.Ui.Widget objects have a parent hierarchy that may differ slightly
162 from their @Efl.Object or @Efl.Canvas.Object hierarchy. This is 162 from their @Efl.Object or @Efl.Canvas.Object hierarchy. This is
163 meant for internal handling. 163 meant for internal handling.
164 164
@@ -169,7 +169,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Efl.Access,
169 legacy: elm_widget_parent_get; /* internal in legacy */ 169 legacy: elm_widget_parent_get; /* internal in legacy */
170 } 170 }
171 values { 171 values {
172 parent: Elm.Widget @nullable; [[Widget parent object]] 172 parent: Efl.Ui.Widget @nullable; [[Widget parent object]]
173 } 173 }
174 } 174 }
175 @property widget_top { 175 @property widget_top {
@@ -194,7 +194,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Efl.Access,
194 legacy: elm_widget_top_get; /* internal in legacy */ 194 legacy: elm_widget_top_get; /* internal in legacy */
195 } 195 }
196 values { 196 values {
197 top: Elm.Widget; [[Top widget, usually a window.]] 197 top: Efl.Ui.Widget; [[Top widget, usually a window.]]
198 } 198 }
199 } 199 }
200 200
@@ -553,7 +553,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Efl.Access,
553 [[The focus manager to register with.]] 553 [[The focus manager to register with.]]
554 @inout configured_state : Efl.Ui.Widget.Focus_State; 554 @inout configured_state : Efl.Ui.Widget.Focus_State;
555 [[The evalulated Focus state that should be used.]] 555 [[The evalulated Focus state that should be used.]]
556 @in redirect : Elm.Widget; 556 @in redirect : Efl.Ui.Widget;
557 [[A redirect that will be set by the elm.widget implementation.]] 557 [[A redirect that will be set by the elm.widget implementation.]]
558 } 558 }
559 return: bool; [[Returns whether the widget is registered or not.]] 559 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 710285a..d789944 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)
1666} 1666}
1667 1667
1668EOLIAN static Eina_Bool 1668EOLIAN static Eina_Bool
1669_efl_ui_win_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Win_Data *sd, Elm_Object_Item *item EINA_UNUSED) 1669_efl_ui_win_efl_ui_widget_on_focus_update(Eo *obj, Efl_Ui_Win_Data *sd, Elm_Object_Item *item EINA_UNUSED)
1670{ 1670{
1671 if (!efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL)) 1671 if (!efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL))
1672 return EINA_TRUE; 1672 return EINA_TRUE;
@@ -5472,7 +5472,7 @@ _efl_ui_win_efl_canvas_object_legacy_ctor(Eo *obj, Efl_Ui_Win_Data *sd)
5472} 5472}
5473 5473
5474EOLIAN static Efl_Ui_Focus_Manager* 5474EOLIAN static Efl_Ui_Focus_Manager*
5475_efl_ui_win_elm_widget_focus_manager_create(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *pd EINA_UNUSED, Efl_Ui_Focus_Object *root) 5475_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)
5476{ 5476{
5477 Efl_Ui_Focus_Manager *manager; 5477 Efl_Ui_Focus_Manager *manager;
5478 5478
@@ -6595,7 +6595,7 @@ _efl_ui_win_keygrab_unset(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, const char *
6595} 6595}
6596 6596
6597EOLIAN static void 6597EOLIAN static void
6598_efl_ui_win_elm_widget_focus_highlight_enabled_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, Eina_Bool enabled) 6598_efl_ui_win_efl_ui_widget_focus_highlight_enabled_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, Eina_Bool enabled)
6599{ 6599{
6600 // Do not call efl_super() here. Only Win handles this property. 6600 // Do not call efl_super() here. Only Win handles this property.
6601 enabled = !!enabled; 6601 enabled = !!enabled;
@@ -6611,7 +6611,7 @@ _efl_ui_win_elm_widget_focus_highlight_enabled_set(Eo *obj EINA_UNUSED, Efl_Ui_W
6611} 6611}
6612 6612
6613EOLIAN static Eina_Bool 6613EOLIAN static Eina_Bool
6614_efl_ui_win_elm_widget_focus_highlight_enabled_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd) 6614_efl_ui_win_efl_ui_widget_focus_highlight_enabled_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
6615{ 6615{
6616 // Do not call efl_super() here. Only Win handles this property. 6616 // Do not call efl_super() here. Only Win handles this property.
6617 return sd->focus_highlight.enabled; 6617 return sd->focus_highlight.enabled;
@@ -6647,7 +6647,7 @@ _elm_win_theme_internal(Eo *obj, Efl_Ui_Win_Data *sd)
6647} 6647}
6648 6648
6649EOLIAN static Efl_Ui_Theme_Apply 6649EOLIAN static Efl_Ui_Theme_Apply
6650_efl_ui_win_elm_widget_theme_apply(Eo *obj, Efl_Ui_Win_Data *sd) 6650_efl_ui_win_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Win_Data *sd)
6651{ 6651{
6652 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; 6652 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
6653 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 6653 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)
6663} 6663}
6664 6664
6665EOLIAN static Eina_Bool 6665EOLIAN static Eina_Bool
6666_efl_ui_win_elm_widget_focus_highlight_style_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, const char *style) 6666_efl_ui_win_efl_ui_widget_focus_highlight_style_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, const char *style)
6667{ 6667{
6668 // Do not call efl_super() here. Only Win handles this property. 6668 // Do not call efl_super() here. Only Win handles this property.
6669 if (!eina_stringshare_replace(&sd->focus_highlight.style, style)) 6669 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
6675} 6675}
6676 6676
6677EOLIAN static const char* 6677EOLIAN static const char*
6678_efl_ui_win_elm_widget_focus_highlight_style_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd) 6678_efl_ui_win_efl_ui_widget_focus_highlight_style_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
6679{ 6679{
6680 // Do not call efl_super() here. Only Win handles this property. 6680 // Do not call efl_super() here. Only Win handles this property.
6681 return sd->focus_highlight.style; 6681 return sd->focus_highlight.style;
6682} 6682}
6683 6683
6684EOLIAN static void 6684EOLIAN static void
6685_efl_ui_win_elm_widget_focus_highlight_animate_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, Eina_Bool animate) 6685_efl_ui_win_efl_ui_widget_focus_highlight_animate_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, Eina_Bool animate)
6686{ 6686{
6687 // Do not call efl_super() here. Only Win handles this property. 6687 // Do not call efl_super() here. Only Win handles this property.
6688 animate = !!animate; 6688 animate = !!animate;
@@ -6695,7 +6695,7 @@ _efl_ui_win_elm_widget_focus_highlight_animate_set(Eo *obj EINA_UNUSED, Efl_Ui_W
6695} 6695}
6696 6696
6697EOLIAN static Eina_Bool 6697EOLIAN static Eina_Bool
6698_efl_ui_win_elm_widget_focus_highlight_animate_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd) 6698_efl_ui_win_efl_ui_widget_focus_highlight_animate_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
6699{ 6699{
6700 // Do not call efl_super() here. Only Win handles this property. 6700 // Do not call efl_super() here. Only Win handles this property.
6701 return sd->focus_highlight.animate; 6701 return sd->focus_highlight.animate;
@@ -7124,7 +7124,7 @@ _elm_win_bg_must_swallow(Efl_Ui_Win_Data *sd)
7124 sd->legacy.bg_must_swallow_init = 1; 7124 sd->legacy.bg_must_swallow_init = 1;
7125 7125
7126 bg = elm_bg_add(sd->obj); 7126 bg = elm_bg_add(sd->obj);
7127 wd = efl_data_scope_get(bg, ELM_WIDGET_CLASS); 7127 wd = efl_data_scope_get(bg, EFL_UI_WIDGET_CLASS);
7128 if (wd) 7128 if (wd)
7129 { 7129 {
7130 version = edje_object_data_get(wd->resize_obj, "version"); 7130 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 ed23a44..85be4f2 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
157 right = (1 << 4) [[Start resizing window to the right]] 157 right = (1 << 4) [[Start resizing window to the right]]
158} 158}
159 159
160class Efl.Ui.Win (Elm.Widget, Efl.Canvas, Efl.Canvas.Pointer, Efl.Access.Window, 160class Efl.Ui.Win (Efl.Ui.Widget, Efl.Canvas, Efl.Canvas.Pointer, Efl.Access.Window,
161 Efl.Access.Component, Efl.Access.Widget.Action, 161 Efl.Access.Component, Efl.Access.Widget.Action,
162 Efl.Content, Efl.Input.State, Efl.Input.Interface, Efl.Screen, 162 Efl.Content, Efl.Input.State, Efl.Input.Interface, Efl.Screen,
163 Efl.Gfx.Size.Hint, Efl.Text, Efl.Config.Global, Efl.Part, 163 Efl.Gfx.Size.Hint, Efl.Text, Efl.Config.Global, Efl.Part,
164 Efl.Ui.Focus.Manager ) 164 Efl.Ui.Focus.Manager )
165{ 165{
166 [[Efl UI window class]] 166 [[Efl UI window class]]
167 legacy_prefix: elm_win; 167 legacy_prefix: elm_win;
@@ -784,14 +784,14 @@ class Efl.Ui.Win (Elm.Widget, Efl.Canvas, Efl.Canvas.Pointer, Efl.Access.Window,
784 Efl.Gfx.Stack.raise; [[Places the window at the top of the stack, so 784 Efl.Gfx.Stack.raise; [[Places the window at the top of the stack, so
785 that it's not covered by any other window.]] 785 that it's not covered by any other window.]]
786 Efl.Gfx.Stack.lower; [[This action is ignored by the Window.]] 786 Efl.Gfx.Stack.lower; [[This action is ignored by the Window.]]
787 Elm.Widget.theme_apply; 787 Efl.Ui.Widget.theme_apply;
788 Efl.Ui.Focus.Object.focus { get; } 788 Efl.Ui.Focus.Object.focus { get; }
789 Elm.Widget.focus_highlight_style { get; set; } 789 Efl.Ui.Widget.focus_highlight_style { get; set; }
790 Elm.Widget.focus_highlight_enabled { get; set; } 790 Efl.Ui.Widget.focus_highlight_enabled { get; set; }
791 Elm.Widget.focus_highlight_animate { get; set; } 791 Efl.Ui.Widget.focus_highlight_animate { get; set; }
792 Elm.Widget.on_focus_update; 792 Efl.Ui.Widget.on_focus_update;
793 Elm.Widget.widget_event; 793 Efl.Ui.Widget.widget_event;
794 Elm.Widget.focus_manager_create; 794 Efl.Ui.Widget.focus_manager_create;
795 Efl.Access.parent { get; } 795 Efl.Access.parent { get; }
796 Efl.Access.state_set { get; } 796 Efl.Access.state_set { get; }
797 Efl.Access.name { get; } 797 Efl.Access.name { get; }
diff --git a/src/lib/elementary/elc_combobox.c b/src/lib/elementary/elc_combobox.c
index aa426b1..03696a3 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
61} 61}
62 62
63EOLIAN static Efl_Ui_Theme_Apply 63EOLIAN static Efl_Ui_Theme_Apply
64_elm_combobox_elm_widget_theme_apply(Eo *obj, Elm_Combobox_Data *sd) 64_elm_combobox_efl_ui_widget_theme_apply(Eo *obj, Elm_Combobox_Data *sd)
65{ 65{
66 const char *style; 66 const char *style;
67 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; 67 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 8454381..5fc6ba3 100644
--- a/src/lib/elementary/elc_ctxpopup.c
+++ b/src/lib/elementary/elc_ctxpopup.c
@@ -4,7 +4,8 @@
4 4
5#define EFL_ACCESS_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#define EFL_ACCESS_WIDGET_ACTION_PROTECTED 6#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
7#define ELM_WIDGET_PROTECTED 7#define EFL_UI_WIDGET_PROTECTED
8//#define EFL_UI_WIDGET_BETA
8#define ELM_WIDGET_ITEM_PROTECTED 9#define ELM_WIDGET_ITEM_PROTECTED
9#define EFL_UI_TRANSLATABLE_PROTECTED 10#define EFL_UI_TRANSLATABLE_PROTECTED
10 11
@@ -522,12 +523,12 @@ _base_shift_by_arrow(Evas_Object *arrow,
522} 523}
523 524
524EOLIAN static Eina_Bool 525EOLIAN static Eina_Bool
525_elm_ctxpopup_elm_widget_widget_sub_object_add(Eo *obj, Elm_Ctxpopup_Data *_pd EINA_UNUSED, Evas_Object *sobj) 526_elm_ctxpopup_efl_ui_widget_widget_sub_object_add(Eo *obj, Elm_Ctxpopup_Data *_pd EINA_UNUSED, Evas_Object *sobj)
526{ 527{
527 /* Skipping elm_layout widget_sub_object_add in order to ignore size hint changes. 528 /* Skipping elm_layout widget_sub_object_add in order to ignore size hint changes.
528 * Note: It is not clear WHY we are doing this. Same reason as genlist? 529 * Note: It is not clear WHY we are doing this. Same reason as genlist?
529 */ 530 */
530 return elm_widget_sub_object_add(efl_cast(obj, ELM_WIDGET_CLASS), sobj); 531 return elm_widget_sub_object_add(efl_cast(obj, EFL_UI_WIDGET_CLASS), sobj);
531} 532}
532 533
533EOLIAN static void 534EOLIAN static void
@@ -667,7 +668,7 @@ _on_content_resized(void *data,
667 668
668//FIXME: lost the content size when theme hook is called. 669//FIXME: lost the content size when theme hook is called.
669EOLIAN static Efl_Ui_Theme_Apply 670EOLIAN static Efl_Ui_Theme_Apply
670_elm_ctxpopup_elm_widget_theme_apply(Eo *obj, Elm_Ctxpopup_Data *sd) 671_elm_ctxpopup_efl_ui_widget_theme_apply(Eo *obj, Elm_Ctxpopup_Data *sd)
671{ 672{
672 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; 673 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
673 674
@@ -1031,7 +1032,7 @@ _elm_ctxpopup_item_efl_object_destructor(Eo *eo_ctxpopup_it,
1031} 1032}
1032 1033
1033EOLIAN static Eina_Bool 1034EOLIAN static Eina_Bool
1034_elm_ctxpopup_elm_widget_on_disabled_update(Eo *obj, Elm_Ctxpopup_Data *sd, Eina_Bool disabled) 1035_elm_ctxpopup_efl_ui_widget_on_disabled_update(Eo *obj, Elm_Ctxpopup_Data *sd, Eina_Bool disabled)
1035{ 1036{
1036 if (!efl_ui_widget_on_disabled_update(efl_super(obj, MY_CLASS), disabled)) 1037 if (!efl_ui_widget_on_disabled_update(efl_super(obj, MY_CLASS), disabled))
1037 return EINA_FALSE; 1038 return EINA_FALSE;
@@ -1118,7 +1119,7 @@ _elm_ctxpopup_efl_canvas_group_group_del(Eo *obj, Elm_Ctxpopup_Data *sd)
1118} 1119}
1119 1120
1120EOLIAN static void 1121EOLIAN static void
1121_elm_ctxpopup_elm_widget_widget_parent_set(Eo *obj, Elm_Ctxpopup_Data *_pd EINA_UNUSED, Evas_Object *parent) 1122_elm_ctxpopup_efl_ui_widget_widget_parent_set(Eo *obj, Elm_Ctxpopup_Data *_pd EINA_UNUSED, Evas_Object *parent)
1122{ 1123{
1123 //default parent is to be hover parent 1124 //default parent is to be hover parent
1124 elm_ctxpopup_hover_parent_set(obj, parent); 1125 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
1445} 1446}
1446 1447
1447EOLIAN static Elm_Object_Item* 1448EOLIAN static Elm_Object_Item*
1448_elm_ctxpopup_elm_widget_focused_item_get(Eo *obj EINA_UNUSED, Elm_Ctxpopup_Data *sd) 1449_elm_ctxpopup_efl_ui_widget_focused_item_get(Eo *obj EINA_UNUSED, Elm_Ctxpopup_Data *sd)
1449{ 1450{
1450 if (!sd->list) return NULL; 1451 if (!sd->list) return NULL;
1451 1452
diff --git a/src/lib/elementary/elc_fileselector.c b/src/lib/elementary/elc_fileselector.c
index bfb1c85..dddd47c 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
232} 232}
233 233
234EOLIAN static Efl_Ui_Theme_Apply 234EOLIAN static Efl_Ui_Theme_Apply
235_elm_fileselector_elm_widget_theme_apply(Eo *obj, Elm_Fileselector_Data *sd) 235_elm_fileselector_efl_ui_widget_theme_apply(Eo *obj, Elm_Fileselector_Data *sd)
236{ 236{
237 const char *style; 237 const char *style;
238 const char *data; 238 const char *data;
@@ -3067,7 +3067,7 @@ _elm_fileselector_elm_interface_fileselector_sort_method_get(Eo *obj EINA_UNUSED
3067} 3067}
3068 3068
3069EOLIAN static Eina_Bool 3069EOLIAN static Eina_Bool
3070_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) 3070_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)
3071{ 3071{
3072 Eina_Bool ret = efl_ui_widget_focus_state_apply(efl_super(obj, MY_CLASS), current_state, configured_state, redirect); 3072 Eina_Bool ret = efl_ui_widget_focus_state_apply(efl_super(obj, MY_CLASS), current_state, configured_state, redirect);
3073 3073
diff --git a/src/lib/elementary/elc_fileselector_button.c b/src/lib/elementary/elc_fileselector_button.c
index 52b7789..3bb4734 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)
44} 44}
45 45
46EOLIAN static Efl_Ui_Theme_Apply 46EOLIAN static Efl_Ui_Theme_Apply
47_elm_fileselector_button_elm_widget_theme_apply(Eo *obj, Elm_Fileselector_Button_Data *sd EINA_UNUSED) 47_elm_fileselector_button_efl_ui_widget_theme_apply(Eo *obj, Elm_Fileselector_Button_Data *sd EINA_UNUSED)
48{ 48{
49 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; 49 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
50 50
diff --git a/src/lib/elementary/elc_fileselector_entry.c b/src/lib/elementary/elc_fileselector_entry.c
index 8b0c423..2dcfcec 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
160} 160}
161 161
162EOLIAN static Efl_Ui_Theme_Apply 162EOLIAN static Efl_Ui_Theme_Apply
163_elm_fileselector_entry_elm_widget_theme_apply(Eo *obj, Elm_Fileselector_Entry_Data *sd) 163_elm_fileselector_entry_efl_ui_widget_theme_apply(Eo *obj, Elm_Fileselector_Entry_Data *sd)
164{ 164{
165 const char *style; 165 const char *style;
166 char buf[1024]; 166 char buf[1024];
@@ -191,7 +191,7 @@ _elm_fileselector_entry_elm_widget_theme_apply(Eo *obj, Elm_Fileselector_Entry_D
191} 191}
192 192
193EOLIAN static Eina_Bool 193EOLIAN static Eina_Bool
194_elm_fileselector_entry_elm_widget_on_disabled_update(Eo *obj, Elm_Fileselector_Entry_Data *sd, Eina_Bool disabled) 194_elm_fileselector_entry_efl_ui_widget_on_disabled_update(Eo *obj, Elm_Fileselector_Entry_Data *sd, Eina_Bool disabled)
195{ 195{
196 if (!efl_ui_widget_on_disabled_update(efl_super(obj, MY_CLASS), disabled)) 196 if (!efl_ui_widget_on_disabled_update(efl_super(obj, MY_CLASS), disabled))
197 return EINA_FALSE; 197 return EINA_FALSE;
diff --git a/src/lib/elementary/elc_hoversel.c b/src/lib/elementary/elc_hoversel.c
index 960458f..2170c21 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
62} 62}
63 63
64EOLIAN static Efl_Ui_Theme_Apply 64EOLIAN static Efl_Ui_Theme_Apply
65_elm_hoversel_elm_widget_theme_apply(Eo *obj, Elm_Hoversel_Data *sd) 65_elm_hoversel_efl_ui_widget_theme_apply(Eo *obj, Elm_Hoversel_Data *sd)
66{ 66{
67 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; 67 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
68 Eina_List *l; 68 Eina_List *l;
@@ -669,7 +669,7 @@ _elm_hoversel_efl_gfx_visible_set(Eo *obj, Elm_Hoversel_Data *sd, Eina_Bool vis)
669} 669}
670 670
671EOLIAN static void 671EOLIAN static void
672_elm_hoversel_elm_widget_widget_parent_set(Eo *obj, Elm_Hoversel_Data *_pd EINA_UNUSED, Evas_Object *parent) 672_elm_hoversel_efl_ui_widget_widget_parent_set(Eo *obj, Elm_Hoversel_Data *_pd EINA_UNUSED, Evas_Object *parent)
673{ 673{
674 elm_hoversel_hover_parent_set(obj, parent); 674 elm_hoversel_hover_parent_set(obj, parent);
675} 675}
@@ -1000,12 +1000,12 @@ _key_action_escape(Evas_Object *obj, const char *params EINA_UNUSED)
1000ELM_WIDGET_KEY_DOWN_DEFAULT_IMPLEMENT(hoversel, Elm_Hoversel_Data) 1000ELM_WIDGET_KEY_DOWN_DEFAULT_IMPLEMENT(hoversel, Elm_Hoversel_Data)
1001 1001
1002EOLIAN static Eina_Bool 1002EOLIAN static Eina_Bool
1003_elm_hoversel_elm_widget_widget_event(Eo *obj, Elm_Hoversel_Data *sd, const Efl_Event *eo_event, Evas_Object *src) 1003_elm_hoversel_efl_ui_widget_widget_event(Eo *obj, Elm_Hoversel_Data *sd, const Efl_Event *eo_event, Evas_Object *src)
1004{ 1004{
1005 if (efl_ui_widget_event(efl_super(obj, MY_CLASS), eo_event, src)) 1005 if (efl_ui_widget_event(efl_super(obj, MY_CLASS), eo_event, src))
1006 return EINA_TRUE; // note: this was FALSE but likely wrong 1006 return EINA_TRUE; // note: this was FALSE but likely wrong
1007 1007
1008 return _hoversel_elm_widget_widget_event(obj, sd, eo_event, src); 1008 return _hoversel_efl_ui_widget_widget_event(obj, sd, eo_event, src);
1009} 1009}
1010 1010
1011static void 1011static void
diff --git a/src/lib/elementary/elc_naviframe.c b/src/lib/elementary/elc_naviframe.c
index 256ff2c..0e1e85e 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[] = {
60}; 60};
61 61
62EOLIAN static void 62EOLIAN static void
63_elm_naviframe_elm_widget_resize_object_set(Eo *obj, Elm_Naviframe_Data *pd EINA_UNUSED, 63_elm_naviframe_efl_ui_widget_resize_object_set(Eo *obj, Elm_Naviframe_Data *pd EINA_UNUSED,
64 Efl_Canvas_Object *sobj) 64 Efl_Canvas_Object *sobj)
65{ 65{
66 if (!sobj || !efl_finalized_get(obj)) goto super; 66 if (!sobj || !efl_finalized_get(obj)) goto super;
@@ -392,7 +392,7 @@ _item_title_enabled_update(Elm_Naviframe_Item_Data *nit, Eina_Bool transition)
392} 392}
393 393
394EOLIAN static Efl_Ui_Theme_Apply 394EOLIAN static Efl_Ui_Theme_Apply
395_elm_naviframe_elm_widget_theme_apply(Eo *obj, Elm_Naviframe_Data *sd) 395_elm_naviframe_efl_ui_widget_theme_apply(Eo *obj, Elm_Naviframe_Data *sd)
396{ 396{
397 Elm_Naviframe_Item_Data *it; 397 Elm_Naviframe_Item_Data *it;
398 const char *style = NULL, *sstyle = NULL; 398 const char *style = NULL, *sstyle = NULL;
@@ -1507,7 +1507,7 @@ _key_action_item_pop(Evas_Object *obj, const char *params EINA_UNUSED)
1507} 1507}
1508 1508
1509EOLIAN static void 1509EOLIAN static void
1510_elm_naviframe_elm_widget_on_access_update(Eo *obj EINA_UNUSED, Elm_Naviframe_Data *sd, Eina_Bool is_access) 1510_elm_naviframe_efl_ui_widget_on_access_update(Eo *obj EINA_UNUSED, Elm_Naviframe_Data *sd, Eina_Bool is_access)
1511{ 1511{
1512 Elm_Naviframe_Item_Data *it; 1512 Elm_Naviframe_Item_Data *it;
1513 1513
diff --git a/src/lib/elementary/elc_player.c b/src/lib/elementary/elc_player.c
index 27cd4f4..368b8ac 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
185} 185}
186 186
187EOLIAN static Efl_Ui_Theme_Apply 187EOLIAN static Efl_Ui_Theme_Apply
188_elm_player_elm_widget_theme_apply(Eo *obj, Elm_Player_Data *sd) 188_elm_player_efl_ui_widget_theme_apply(Eo *obj, Elm_Player_Data *sd)
189{ 189{
190 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; 190 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
191 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 191 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 cc10c9d..598f971 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)
351} 351}
352 352
353EOLIAN static Efl_Ui_Theme_Apply 353EOLIAN static Efl_Ui_Theme_Apply
354_elm_popup_elm_widget_theme_apply(Eo *obj, Elm_Popup_Data *sd) 354_elm_popup_efl_ui_widget_theme_apply(Eo *obj, Elm_Popup_Data *sd)
355{ 355{
356 Elm_Popup_Item_Data *it; 356 Elm_Popup_Item_Data *it;
357 Eina_List *elist; 357 Eina_List *elist;
@@ -506,7 +506,7 @@ _elm_popup_efl_layout_signal_signal_emit(Eo *obj EINA_UNUSED, Elm_Popup_Data *sd
506} 506}
507 507
508EOLIAN static Eina_Bool 508EOLIAN static Eina_Bool
509_elm_popup_elm_widget_widget_sub_object_del(Eo *obj, Elm_Popup_Data *sd, Evas_Object *sobj) 509_elm_popup_efl_ui_widget_widget_sub_object_del(Eo *obj, Elm_Popup_Data *sd, Evas_Object *sobj)
510{ 510{
511 Elm_Popup_Item_Data *it; 511 Elm_Popup_Item_Data *it;
512 Eina_Bool int_ret = EINA_FALSE; 512 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
1484} 1484}
1485 1485
1486EOLIAN static void 1486EOLIAN static void
1487_elm_popup_elm_widget_widget_parent_set(Eo *obj, Elm_Popup_Data *sd, Evas_Object *parent) 1487_elm_popup_efl_ui_widget_widget_parent_set(Eo *obj, Elm_Popup_Data *sd, Evas_Object *parent)
1488{ 1488{
1489 Evas_Coord x, y, w, h; 1489 Evas_Coord x, y, w, h;
1490 evas_object_geometry_get(parent, &x, &y, &w, &h); 1490 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
1503} 1503}
1504 1504
1505EOLIAN static void 1505EOLIAN static void
1506_elm_popup_elm_widget_on_access_update(Eo *obj, Elm_Popup_Data *_pd EINA_UNUSED, Eina_Bool is_access) 1506_elm_popup_efl_ui_widget_on_access_update(Eo *obj, Elm_Popup_Data *_pd EINA_UNUSED, Eina_Bool is_access)
1507{ 1507{
1508 _access_obj_process(obj, is_access); 1508 _access_obj_process(obj, is_access);
1509} 1509}
diff --git a/src/lib/elementary/elementary_config.h b/src/lib/elementary/elementary_config.h
index 3830254..9e06604 100644
--- a/src/lib/elementary/elementary_config.h
+++ b/src/lib/elementary/elementary_config.h
@@ -10,8 +10,8 @@
10#define ELM_CONFIG_ICON_THEME_ELEMENTARY "_Elementary_Icon_Theme" 10#define ELM_CONFIG_ICON_THEME_ELEMENTARY "_Elementary_Icon_Theme"
11 11
12#if defined(ELEMENTARY_BUILD) || defined(ELM_INTERNAL_API_ARGESFSDFEFC) 12#if defined(ELEMENTARY_BUILD) || defined(ELM_INTERNAL_API_ARGESFSDFEFC)
13#define ELM_WIDGET_PROTECTED 13#define EFL_UI_WIDGET_PROTECTED
14#define ELM_WIDGET_BETA 14#define EFL_UI_WIDGET_BETA
15#define EFL_CANVAS_OBJECT_PROTECTED 15#define EFL_CANVAS_OBJECT_PROTECTED
16#define EFL_CANVAS_GROUP_PROTECTED 16#define EFL_CANVAS_GROUP_PROTECTED
17#define EFL_CANVAS_GROUP_BETA 17#define EFL_CANVAS_GROUP_BETA
diff --git a/src/lib/elementary/elm_access.c b/src/lib/elementary/elm_access.c
index 5cf518f..0c69b0b 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,
84} 84}
85 85
86EOLIAN static Eina_Bool 86EOLIAN static Eina_Bool
87_elm_access_elm_widget_on_access_activate(Eo *obj, void *_pd EINA_UNUSED, Efl_Ui_Activate act) 87_elm_access_efl_ui_widget_on_access_activate(Eo *obj, void *_pd EINA_UNUSED, Efl_Ui_Activate act)
88{ 88{
89 int type = ELM_ACCESS_ACTION_FIRST; 89 int type = ELM_ACCESS_ACTION_FIRST;
90 90
@@ -145,7 +145,7 @@ _elm_access_elm_widget_on_access_activate(Eo *obj, void *_pd EINA_UNUSED, Efl_Ui
145} 145}
146 146
147EOLIAN static Eina_Bool 147EOLIAN static Eina_Bool
148_elm_access_elm_widget_on_focus_update(Eo *obj, void *_pd EINA_UNUSED, Elm_Object_Item *item EINA_UNUSED) 148_elm_access_efl_ui_widget_on_focus_update(Eo *obj, void *_pd EINA_UNUSED, Elm_Object_Item *item EINA_UNUSED)
149{ 149{
150 evas_object_focus_set(obj, efl_ui_focus_object_focus_get(obj)); 150 evas_object_focus_set(obj, efl_ui_focus_object_focus_get(obj));
151 151
diff --git a/src/lib/elementary/elm_access.eo b/src/lib/elementary/elm_access.eo
index 10cb87d..b730f4a 100644
--- a/src/lib/elementary/elm_access.eo
+++ b/src/lib/elementary/elm_access.eo
@@ -1,4 +1,4 @@
1class Elm.Access (Elm.Widget, Efl.Access.Widget.Action) 1class Elm.Access (Efl.Ui.Widget, Efl.Access.Widget.Action)
2{ 2{
3 [[Elm abstract accessibility class]] 3 [[Elm abstract accessibility class]]
4 legacy_prefix: elm_access; 4 legacy_prefix: elm_access;
@@ -7,8 +7,8 @@ class Elm.Access (Elm.Widget, Efl.Access.Widget.Action)
7 implements { 7 implements {
8 class.constructor; 8 class.constructor;
9 Efl.Object.constructor; 9 Efl.Object.constructor;
10 Elm.Widget.on_access_activate; 10 Efl.Ui.Widget.on_access_activate;
11 Elm.Widget.on_focus_update; 11 Efl.Ui.Widget.on_focus_update;
12 Efl.Access.Widget.Action.elm_actions { get; } 12 Efl.Access.Widget.Action.elm_actions { get; }
13 Efl.Access.state_set { get; } 13 Efl.Access.state_set { get; }
14 } 14 }
diff --git a/src/lib/elementary/elm_actionslider.c b/src/lib/elementary/elm_actionslider.c
index 1fdbf29..1c45951 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)
113} 113}
114 114
115EOLIAN static Efl_Ui_Theme_Apply 115EOLIAN static Efl_Ui_Theme_Apply
116_elm_actionslider_elm_widget_theme_apply(Eo *obj, Elm_Actionslider_Data *sd EINA_UNUSED) 116_elm_actionslider_efl_ui_widget_theme_apply(Eo *obj, Elm_Actionslider_Data *sd EINA_UNUSED)
117{ 117{
118 Eina_Bool mirrored; 118 Eina_Bool mirrored;
119 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; 119 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 d400723..30f78db 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)
71 implements { 71 implements {
72 class.constructor; 72 class.constructor;
73 Efl.Object.constructor; 73 Efl.Object.constructor;
74 Elm.Widget.theme_apply; 74 Efl.Ui.Widget.theme_apply;
75 Efl.Part.part; 75 Efl.Part.part;
76 } 76 }
77 events { 77 events {
diff --git a/src/lib/elementary/elm_box.c b/src/lib/elementary/elm_box.c
index 6b4a886..a7acdd4 100644
--- a/src/lib/elementary/elm_box.c
+++ b/src/lib/elementary/elm_box.c
@@ -27,14 +27,14 @@ static void
27_elm_box_efl_ui_focus_composition_prepare(Eo *obj, Elm_Box_Data *pd EINA_UNUSED) 27_elm_box_efl_ui_focus_composition_prepare(Eo *obj, Elm_Box_Data *pd EINA_UNUSED)
28{ 28{
29 Eina_List *n, *nn; 29 Eina_List *n, *nn;
30 Elm_Widget *elem; 30 Efl_Ui_Widget *elem;
31 31
32 Elm_Widget_Smart_Data *wpd = efl_data_scope_get(obj, ELM_WIDGET_CLASS); 32 Elm_Widget_Smart_Data *wpd = efl_data_scope_get(obj, EFL_UI_WIDGET_CLASS);
33 Eina_List *order = evas_object_box_children_get(wpd->resize_obj); 33 Eina_List *order = evas_object_box_children_get(wpd->resize_obj);
34 34
35 EINA_LIST_FOREACH_SAFE(order, n, nn, elem) 35 EINA_LIST_FOREACH_SAFE(order, n, nn, elem)
36 { 36 {
37 if (!efl_isa(elem, ELM_WIDGET_CLASS)) 37 if (!efl_isa(elem, EFL_UI_WIDGET_CLASS))
38 order = eina_list_remove(order, elem); 38 order = eina_list_remove(order, elem);
39 } 39 }
40 40
@@ -58,7 +58,7 @@ _child_removed_cb_proxy(void *data, const Efl_Event *event)
58} 58}
59 59
60EOLIAN static Efl_Ui_Theme_Apply 60EOLIAN static Efl_Ui_Theme_Apply
61_elm_box_elm_widget_theme_apply(Eo *obj, Elm_Box_Data *sd EINA_UNUSED) 61_elm_box_e