summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/elementary/efl_ui_bg_widget.eo2
-rw-r--r--src/lib/elementary/efl_ui_button.eo2
-rw-r--r--src/lib/elementary/efl_ui_button_legacy_part.eo2
-rw-r--r--src/lib/elementary/efl_ui_calendar.eo2
-rw-r--r--src/lib/elementary/efl_ui_check_legacy_part.eo2
-rw-r--r--src/lib/elementary/efl_ui_clock.eo2
-rw-r--r--src/lib/elementary/efl_ui_datepicker.eo2
-rw-r--r--src/lib/elementary/efl_ui_frame.eo2
-rw-r--r--src/lib/elementary/efl_ui_item.eo2
-rw-r--r--src/lib/elementary/efl_ui_layout.c (renamed from src/lib/elementary/efl_ui_layout_object.c)236
-rw-r--r--src/lib/elementary/efl_ui_layout.eo (renamed from src/lib/elementary/efl_ui_layout_object.eo)4
-rw-r--r--src/lib/elementary/efl_ui_layout_factory.c4
-rw-r--r--src/lib/elementary/efl_ui_layout_legacy.eo2
-rw-r--r--src/lib/elementary/efl_ui_layout_pack.c28
-rw-r--r--src/lib/elementary/efl_ui_layout_part.eo2
-rw-r--r--src/lib/elementary/efl_ui_layout_part_bg.eo2
-rw-r--r--src/lib/elementary/efl_ui_layout_part_box.eo2
-rw-r--r--src/lib/elementary/efl_ui_layout_part_content.eo2
-rw-r--r--src/lib/elementary/efl_ui_layout_part_legacy.eo2
-rw-r--r--src/lib/elementary/efl_ui_layout_part_table.eo2
-rw-r--r--src/lib/elementary/efl_ui_layout_part_text.eo2
-rw-r--r--src/lib/elementary/efl_ui_list.c2
-rw-r--r--src/lib/elementary/efl_ui_list.eo2
-rw-r--r--src/lib/elementary/efl_ui_list_default_item.c2
-rw-r--r--src/lib/elementary/efl_ui_list_default_item_part_end.eo2
-rw-r--r--src/lib/elementary/efl_ui_list_default_item_part_icon.eo2
-rw-r--r--src/lib/elementary/efl_ui_list_empty_item.c2
-rw-r--r--src/lib/elementary/efl_ui_list_view.eo4
-rw-r--r--src/lib/elementary/efl_ui_list_view_types.eot2
-rw-r--r--src/lib/elementary/efl_ui_navigation_bar.eo2
-rw-r--r--src/lib/elementary/efl_ui_navigation_bar_part.eo2
-rw-r--r--src/lib/elementary/efl_ui_navigation_bar_part_back_button.eo2
-rw-r--r--src/lib/elementary/efl_ui_navigation_layout.c6
-rw-r--r--src/lib/elementary/efl_ui_navigation_layout.eo4
-rw-r--r--src/lib/elementary/efl_ui_navigation_layout_private.h2
-rw-r--r--src/lib/elementary/efl_ui_pager.eo2
-rw-r--r--src/lib/elementary/efl_ui_panes.eo2
-rw-r--r--src/lib/elementary/efl_ui_panes_part.eo2
-rw-r--r--src/lib/elementary/efl_ui_popup.eo2
-rw-r--r--src/lib/elementary/efl_ui_popup_alert.c2
-rw-r--r--src/lib/elementary/efl_ui_popup_alert_part.eo2
-rw-r--r--src/lib/elementary/efl_ui_popup_alert_scroll_part.eo2
-rw-r--r--src/lib/elementary/efl_ui_popup_alert_text_part.eo2
-rw-r--r--src/lib/elementary/efl_ui_popup_part_backwall.eo2
-rw-r--r--src/lib/elementary/efl_ui_progressbar.eo2
-rw-r--r--src/lib/elementary/efl_ui_progressbar_legacy_part.eo2
-rw-r--r--src/lib/elementary/efl_ui_progressbar_part.eo2
-rw-r--r--src/lib/elementary/efl_ui_radio_legacy_part.eo2
-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.eo2
-rw-r--r--src/lib/elementary/efl_ui_spin.eo2
-rw-r--r--src/lib/elementary/efl_ui_stack.eo2
-rw-r--r--src/lib/elementary/efl_ui_tab_bar.c2
-rw-r--r--src/lib/elementary/efl_ui_tab_bar.eo2
-rw-r--r--src/lib/elementary/efl_ui_tab_page.eo2
-rw-r--r--src/lib/elementary/efl_ui_tab_page_part_tab.eo2
-rw-r--r--src/lib/elementary/efl_ui_tags.c2
-rw-r--r--src/lib/elementary/efl_ui_tags.eo2
-rw-r--r--src/lib/elementary/efl_ui_text.c2
-rw-r--r--src/lib/elementary/efl_ui_text.eo2
-rw-r--r--src/lib/elementary/efl_ui_textpath.eo2
-rw-r--r--src/lib/elementary/efl_ui_textpath_part.eo2
-rw-r--r--src/lib/elementary/efl_ui_timepicker.eo2
-rw-r--r--src/lib/elementary/efl_ui_video.eo2
-rw-r--r--src/lib/elementary/efl_ui_widget.c16
-rw-r--r--src/lib/elementary/elm_actionslider.eo2
-rw-r--r--src/lib/elementary/elm_actionslider_part.eo2
-rw-r--r--src/lib/elementary/elm_bubble.eo2
-rw-r--r--src/lib/elementary/elm_bubble_part.eo2
-rw-r--r--src/lib/elementary/elm_calendar.eo2
-rw-r--r--src/lib/elementary/elm_clock.eo2
-rw-r--r--src/lib/elementary/elm_code_widget.eo2
-rw-r--r--src/lib/elementary/elm_colorselector.eo2
-rw-r--r--src/lib/elementary/elm_conformant.eo2
-rw-r--r--src/lib/elementary/elm_ctxpopup.eo2
-rw-r--r--src/lib/elementary/elm_ctxpopup_part.eo2
-rw-r--r--src/lib/elementary/elm_dayselector.eo2
-rw-r--r--src/lib/elementary/elm_dayselector_part.eo2
-rw-r--r--src/lib/elementary/elm_entry.c2
-rw-r--r--src/lib/elementary/elm_entry.eo2
-rw-r--r--src/lib/elementary/elm_entry_part.eo2
-rw-r--r--src/lib/elementary/elm_fileselector.eo2
-rw-r--r--src/lib/elementary/elm_fileselector_entry.eo2
-rw-r--r--src/lib/elementary/elm_fileselector_entry_part.eo2
-rw-r--r--src/lib/elementary/elm_fileselector_part.eo2
-rw-r--r--src/lib/elementary/elm_flipselector.eo2
-rw-r--r--src/lib/elementary/elm_gengrid.eo2
-rw-r--r--src/lib/elementary/elm_genlist.c2
-rw-r--r--src/lib/elementary/elm_genlist.eo2
-rw-r--r--src/lib/elementary/elm_hover.eo2
-rw-r--r--src/lib/elementary/elm_hover_part.eo2
-rw-r--r--src/lib/elementary/elm_index.eo2
-rw-r--r--src/lib/elementary/elm_inwin.eo2
-rw-r--r--src/lib/elementary/elm_label.eo2
-rw-r--r--src/lib/elementary/elm_label_part.eo2
-rw-r--r--src/lib/elementary/elm_layout.h2
-rw-r--r--src/lib/elementary/elm_layout_legacy.h2
-rw-r--r--src/lib/elementary/elm_list.eo2
-rw-r--r--src/lib/elementary/elm_main.c4
-rw-r--r--src/lib/elementary/elm_multibuttonentry.eo2
-rw-r--r--src/lib/elementary/elm_multibuttonentry_part.eo2
-rw-r--r--src/lib/elementary/elm_naviframe.eo2
-rw-r--r--src/lib/elementary/elm_naviframe_part.eo2
-rw-r--r--src/lib/elementary/elm_panel.eo2
-rw-r--r--src/lib/elementary/elm_player.eo2
-rw-r--r--src/lib/elementary/elm_player_part.eo2
-rw-r--r--src/lib/elementary/elm_popup.eo2
-rw-r--r--src/lib/elementary/elm_popup_part.eo2
-rw-r--r--src/lib/elementary/elm_scroller.eo2
-rw-r--r--src/lib/elementary/elm_scroller_part.eo2
-rw-r--r--src/lib/elementary/elm_segment_control.eo2
-rw-r--r--src/lib/elementary/elm_separator.eo2
-rw-r--r--src/lib/elementary/elm_slider_part_indicator.eo2
-rw-r--r--src/lib/elementary/elm_slideshow.eo2
-rw-r--r--src/lib/elementary/elm_spinner.eo2
-rw-r--r--src/lib/elementary/elm_thumb.eo2
-rw-r--r--src/lib/elementary/elm_widget_layout.h6
-rw-r--r--src/lib/elementary/meson.build4
119 files changed, 266 insertions, 266 deletions
diff --git a/src/lib/elementary/efl_ui_bg_widget.eo b/src/lib/elementary/efl_ui_bg_widget.eo
index f54775c..6af5aa5 100644
--- a/src/lib/elementary/efl_ui_bg_widget.eo
+++ b/src/lib/elementary/efl_ui_bg_widget.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Bg_Widget (Efl.Ui.Layout.Object, Efl.Ui.Bg, Efl.Gfx.Image_Load_Controller) 1class Efl.Ui.Bg_Widget (Efl.Ui.Layout, Efl.Ui.Bg, Efl.Gfx.Image_Load_Controller)
2{ 2{
3 [[The bg (background) widget is used for setting (solid) background decorations 3 [[The bg (background) widget is used for setting (solid) background decorations
4 4
diff --git a/src/lib/elementary/efl_ui_button.eo b/src/lib/elementary/efl_ui_button.eo
index 64c0b7f..851f54e 100644
--- a/src/lib/elementary/efl_ui_button.eo
+++ b/src/lib/elementary/efl_ui_button.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Button (Efl.Ui.Layout.Object, Efl.Ui.Clickable, Efl.Ui.Autorepeat, 1class Efl.Ui.Button (Efl.Ui.Layout, Efl.Ui.Clickable, Efl.Ui.Autorepeat,
2 Efl.Text, Efl.Content, 2 Efl.Text, Efl.Content,
3 Efl.Access.Widget.Action, Efl.Ui.Translatable) 3 Efl.Access.Widget.Action, Efl.Ui.Translatable)
4{ 4{
diff --git a/src/lib/elementary/efl_ui_button_legacy_part.eo b/src/lib/elementary/efl_ui_button_legacy_part.eo
index 15b07c8..ba66edf 100644
--- a/src/lib/elementary/efl_ui_button_legacy_part.eo
+++ b/src/lib/elementary/efl_ui_button_legacy_part.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Button_Legacy_Part (Efl.Ui.Layout.Part_Content) 1class Efl.Ui.Button_Legacy_Part (Efl.Ui.Layout_Part_Content)
2{ 2{
3 [[Elementary button internal part class]] 3 [[Elementary button internal part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/efl_ui_calendar.eo b/src/lib/elementary/efl_ui_calendar.eo
index 5caa2e6..4a6415f 100644
--- a/src/lib/elementary/efl_ui_calendar.eo
+++ b/src/lib/elementary/efl_ui_calendar.eo
@@ -16,7 +16,7 @@ enum Efl.Ui.Calendar_Weekday
16 last [[Sentinel value to indicate last enum field during iteration]] 16 last [[Sentinel value to indicate last enum field during iteration]]
17} 17}
18 18
19class Efl.Ui.Calendar (Efl.Ui.Layout.Object, Efl.Ui.Focus.Composition, Efl.Access.Widget.Action, Efl.Ui.Format) 19class Efl.Ui.Calendar (Efl.Ui.Layout, Efl.Ui.Focus.Composition, Efl.Access.Widget.Action, Efl.Ui.Format)
20{ 20{
21 [[Calendar widget 21 [[Calendar widget
22 22
diff --git a/src/lib/elementary/efl_ui_check_legacy_part.eo b/src/lib/elementary/efl_ui_check_legacy_part.eo
index 40d62d3..7907db9 100644
--- a/src/lib/elementary/efl_ui_check_legacy_part.eo
+++ b/src/lib/elementary/efl_ui_check_legacy_part.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Check_Legacy_Part (Efl.Ui.Layout.Part_Content) 1class Efl.Ui.Check_Legacy_Part (Efl.Ui.Layout_Part_Content)
2{ 2{
3 [[Elementary check internal part class]] 3 [[Elementary check internal part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/efl_ui_clock.eo b/src/lib/elementary/efl_ui_clock.eo
index 962b7ba..f882ba0 100644
--- a/src/lib/elementary/efl_ui_clock.eo
+++ b/src/lib/elementary/efl_ui_clock.eo
@@ -16,7 +16,7 @@ enum Efl.Ui.Clock_Type
16 ampm = 7, [[Indicates AM/PM field .]] 16 ampm = 7, [[Indicates AM/PM field .]]
17} 17}
18 18
19class Efl.Ui.Clock (Efl.Ui.Layout.Object) 19class Efl.Ui.Clock (Efl.Ui.Layout)
20{ 20{
21 [[Efl UI clock class]] 21 [[Efl UI clock class]]
22 methods { 22 methods {
diff --git a/src/lib/elementary/efl_ui_datepicker.eo b/src/lib/elementary/efl_ui_datepicker.eo
index 7b769e9..74a0876 100644
--- a/src/lib/elementary/efl_ui_datepicker.eo
+++ b/src/lib/elementary/efl_ui_datepicker.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Datepicker (Efl.Ui.Layout.Object) 1class Efl.Ui.Datepicker (Efl.Ui.Layout)
2{ 2{
3 [[Datepicker widget 3 [[Datepicker widget
4 4
diff --git a/src/lib/elementary/efl_ui_frame.eo b/src/lib/elementary/efl_ui_frame.eo
index dd2d25c..038f257 100644
--- a/src/lib/elementary/efl_ui_frame.eo
+++ b/src/lib/elementary/efl_ui_frame.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Frame (Efl.Ui.Layout.Object, Efl.Ui.Clickable, Efl.Text, Efl.Text_Markup, 1class Efl.Ui.Frame (Efl.Ui.Layout, Efl.Ui.Clickable, Efl.Text, Efl.Text_Markup,
2 Efl.Ui.Translatable, Efl.Content) 2 Efl.Ui.Translatable, Efl.Content)
3{ 3{
4 [[Frame widget 4 [[Frame widget
diff --git a/src/lib/elementary/efl_ui_item.eo b/src/lib/elementary/efl_ui_item.eo
index 6137dd9..ea9cf5d 100644
--- a/src/lib/elementary/efl_ui_item.eo
+++ b/src/lib/elementary/efl_ui_item.eo
@@ -1,4 +1,4 @@
1abstract Efl.Ui.Item (Efl.Ui.Layout.Object, Efl.Ui.Selectable, Efl.Ui.Clickable) 1abstract Efl.Ui.Item (Efl.Ui.Layout, Efl.Ui.Selectable, Efl.Ui.Clickable)
2{ 2{
3 [[Item abstract class for pack widget. All item have to be inherited from this class.]] 3 [[Item abstract class for pack widget. All item have to be inherited from this class.]]
4 methods { 4 methods {
diff --git a/src/lib/elementary/efl_ui_layout_object.c b/src/lib/elementary/efl_ui_layout.c
index f3b4cd1..66ee479 100644
--- a/src/lib/elementary/efl_ui_layout_object.c
+++ b/src/lib/elementary/efl_ui_layout.c
@@ -14,14 +14,14 @@
14#include "elm_part_helper.h" 14#include "elm_part_helper.h"
15#include "elm_entry.eo.h" 15#include "elm_entry.eo.h"
16 16
17#define MY_CLASS EFL_UI_LAYOUT_OBJECT_CLASS 17#define MY_CLASS EFL_UI_LAYOUT_CLASS
18#define MY_CLASS_PFX efl_ui_layout_object 18#define MY_CLASS_PFX efl_ui_layout
19 19
20#define MY_CLASS_NAME "Efl.Ui.Layout.Object" 20#define MY_CLASS_NAME "Efl.Ui.Layout"
21 21
22Eo *_efl_ui_layout_pack_proxy_get(Efl_Ui_Layout_Object *obj, Edje_Part_Type type, const char *part); 22Eo *_efl_ui_layout_pack_proxy_get(Efl_Ui_Layout *obj, Edje_Part_Type type, const char *part);
23static void _efl_model_properties_changed_cb(void *, const Efl_Event *); 23static void _efl_model_properties_changed_cb(void *, const Efl_Event *);
24static Eina_Bool _efl_ui_layout_part_cursor_unset(Efl_Ui_Layout_Object_Data *sd, const char *part_name); 24static Eina_Bool _efl_ui_layout_part_cursor_unset(Efl_Ui_Layout_Data *sd, const char *part_name);
25 25
26static const char SIG_THEME_CHANGED[] = "theme,changed"; 26static const char SIG_THEME_CHANGED[] = "theme,changed";
27const char SIG_LAYOUT_FOCUSED[] = "focused"; 27const char SIG_LAYOUT_FOCUSED[] = "focused";
@@ -80,7 +80,7 @@ struct _Efl_Ui_Layout_Sub_Iterator
80{ 80{
81 Eina_Iterator iterator; 81 Eina_Iterator iterator;
82 Eina_Iterator *real_iterator; 82 Eina_Iterator *real_iterator;
83 Efl_Ui_Layout_Object *object; 83 Efl_Ui_Layout *object;
84}; 84};
85 85
86struct _Efl_Ui_Layout_Sub_Object_Data 86struct _Efl_Ui_Layout_Sub_Object_Data
@@ -123,7 +123,7 @@ struct _Efl_Ui_Layout_Sub_Object_Cursor
123#define MY_CLASS_NAME_LEGACY "elm_layout" 123#define MY_CLASS_NAME_LEGACY "elm_layout"
124 124
125static void 125static void
126_efl_ui_layout_object_class_constructor(Efl_Class *klass) 126_efl_ui_layout_class_constructor(Efl_Class *klass)
127{ 127{
128 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); 128 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
129} 129}
@@ -149,7 +149,7 @@ _part_cursor_free(Efl_Ui_Layout_Sub_Object_Cursor *pc)
149} 149}
150 150
151static void 151static void
152_sizing_eval(Evas_Object *obj, Efl_Ui_Layout_Object_Data *sd) 152_sizing_eval(Evas_Object *obj, Efl_Ui_Layout_Data *sd)
153{ 153{
154 Evas_Coord minh = -1, minw = -1; 154 Evas_Coord minh = -1, minw = -1;
155 Evas_Coord rest_w = 0, rest_h = 0; 155 Evas_Coord rest_w = 0, rest_h = 0;
@@ -192,7 +192,7 @@ _signals_emit(Eo *obj,
192} 192}
193 193
194static inline void 194static inline void
195_icon_signal_emit(Efl_Ui_Layout_Object_Data *sd, 195_icon_signal_emit(Efl_Ui_Layout_Data *sd,
196 Efl_Ui_Layout_Sub_Object_Data *sub_d, 196 Efl_Ui_Layout_Sub_Object_Data *sub_d,
197 Eina_Bool visible) 197 Eina_Bool visible)
198{ 198{
@@ -245,7 +245,7 @@ _icon_signal_emit(Efl_Ui_Layout_Object_Data *sd,
245} 245}
246 246
247static inline void 247static inline void
248_text_signal_emit(Efl_Ui_Layout_Object_Data *sd, 248_text_signal_emit(Efl_Ui_Layout_Data *sd,
249 Efl_Ui_Layout_Sub_Object_Data *sub_d, 249 Efl_Ui_Layout_Sub_Object_Data *sub_d,
250 Eina_Bool visible) 250 Eina_Bool visible)
251{ 251{
@@ -302,7 +302,7 @@ _text_signal_emit(Efl_Ui_Layout_Object_Data *sd,
302} 302}
303 303
304static void 304static void
305_parts_signals_emit(Efl_Ui_Layout_Object_Data *sd) 305_parts_signals_emit(Efl_Ui_Layout_Data *sd)
306{ 306{
307 const Eina_List *l; 307 const Eina_List *l;
308 Efl_Ui_Layout_Sub_Object_Data *sub_d; 308 Efl_Ui_Layout_Sub_Object_Data *sub_d;
@@ -323,7 +323,7 @@ _part_cursor_part_apply(const Efl_Ui_Layout_Sub_Object_Cursor *pc)
323} 323}
324 324
325static void 325static void
326_parts_cursors_apply(Efl_Ui_Layout_Object_Data *sd) 326_parts_cursors_apply(Efl_Ui_Layout_Data *sd)
327{ 327{
328 const Eina_List *l; 328 const Eina_List *l;
329 const char *file, *group; 329 const char *file, *group;
@@ -387,7 +387,7 @@ _efl_ui_layout_highlight_in_theme(Evas_Object *obj)
387 387
388static Eina_Bool 388static Eina_Bool
389_visuals_refresh(Evas_Object *obj, 389_visuals_refresh(Evas_Object *obj,
390 Efl_Ui_Layout_Object_Data *sd) 390 Efl_Ui_Layout_Data *sd)
391{ 391{
392 Eina_Bool ret = EINA_FALSE; 392 Eina_Bool ret = EINA_FALSE;
393 393
@@ -413,7 +413,7 @@ _visuals_refresh(Evas_Object *obj,
413} 413}
414 414
415EOLIAN static Eina_Bool 415EOLIAN static Eina_Bool
416_efl_ui_layout_object_efl_ui_widget_on_disabled_update(Eo *obj, Efl_Ui_Layout_Object_Data *_pd EINA_UNUSED, Eina_Bool disabled) 416_efl_ui_layout_efl_ui_widget_on_disabled_update(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED, Eina_Bool disabled)
417{ 417{
418 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); 418 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
419 419
@@ -442,7 +442,7 @@ _efl_ui_layout_object_efl_ui_widget_on_disabled_update(Eo *obj, Efl_Ui_Layout_Ob
442} 442}
443 443
444static Efl_Ui_Theme_Apply 444static Efl_Ui_Theme_Apply
445_efl_ui_layout_theme_internal(Eo *obj, Efl_Ui_Layout_Object_Data *sd) 445_efl_ui_layout_theme_internal(Eo *obj, Efl_Ui_Layout_Data *sd)
446{ 446{
447 Efl_Ui_Theme_Apply ret = EFL_UI_THEME_APPLY_FAILED; 447 Efl_Ui_Theme_Apply ret = EFL_UI_THEME_APPLY_FAILED;
448 448
@@ -459,7 +459,7 @@ _efl_ui_layout_theme_internal(Eo *obj, Efl_Ui_Layout_Object_Data *sd)
459 } 459 }
460 460
461 if (ret) 461 if (ret)
462 efl_event_callback_legacy_call(obj, EFL_UI_LAYOUT_OBJECT_EVENT_THEME_CHANGED, NULL); 462 efl_event_callback_legacy_call(obj, EFL_UI_LAYOUT_EVENT_THEME_CHANGED, NULL);
463 463
464 if (!_visuals_refresh(obj, sd)) 464 if (!_visuals_refresh(obj, sd))
465 ret = EFL_UI_THEME_APPLY_FAILED; 465 ret = EFL_UI_THEME_APPLY_FAILED;
@@ -468,7 +468,7 @@ _efl_ui_layout_theme_internal(Eo *obj, Efl_Ui_Layout_Object_Data *sd)
468} 468}
469 469
470EOLIAN static Efl_Ui_Theme_Apply 470EOLIAN static Efl_Ui_Theme_Apply
471_efl_ui_layout_object_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Layout_Object_Data *sd) 471_efl_ui_layout_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Layout_Data *sd)
472{ 472{
473 Efl_Ui_Theme_Apply theme_apply = EFL_UI_THEME_APPLY_FAILED; 473 Efl_Ui_Theme_Apply theme_apply = EFL_UI_THEME_APPLY_FAILED;
474 474
@@ -480,7 +480,7 @@ _efl_ui_layout_object_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Layout_Object_Da
480} 480}
481 481
482EOLIAN static Eina_Bool 482EOLIAN static Eina_Bool
483_efl_ui_layout_object_efl_ui_focus_object_on_focus_update(Eo *obj, Efl_Ui_Layout_Object_Data *_pd EINA_UNUSED) 483_efl_ui_layout_efl_ui_focus_object_on_focus_update(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED)
484{ 484{
485 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); 485 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
486 486
@@ -512,7 +512,7 @@ _efl_ui_layout_object_efl_ui_focus_object_on_focus_update(Eo *obj, Efl_Ui_Layout
512} 512}
513 513
514EOLIAN static Eina_Bool 514EOLIAN static Eina_Bool
515_efl_ui_layout_object_efl_ui_widget_widget_sub_object_add(Eo *obj, Efl_Ui_Layout_Object_Data *_pd EINA_UNUSED, Evas_Object *sobj) 515_efl_ui_layout_efl_ui_widget_widget_sub_object_add(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED, Evas_Object *sobj)
516{ 516{
517 Eina_Bool int_ret = EINA_FALSE; 517 Eina_Bool int_ret = EINA_FALSE;
518 518
@@ -529,7 +529,7 @@ _efl_ui_layout_object_efl_ui_widget_widget_sub_object_add(Eo *obj, Efl_Ui_Layout
529} 529}
530 530
531EOLIAN static Eina_Bool 531EOLIAN static Eina_Bool
532_efl_ui_layout_object_efl_ui_widget_widget_sub_object_del(Eo *obj, Efl_Ui_Layout_Object_Data *sd, Evas_Object *sobj) 532_efl_ui_layout_efl_ui_widget_widget_sub_object_del(Eo *obj, Efl_Ui_Layout_Data *sd, Evas_Object *sobj)
533{ 533{
534 Eina_List *l; 534 Eina_List *l;
535 Efl_Ui_Layout_Sub_Object_Data *sub_d; 535 Efl_Ui_Layout_Sub_Object_Data *sub_d;
@@ -647,7 +647,7 @@ _box_reference_del(void *data,
647 647
648static Evas_Object * 648static Evas_Object *
649_sub_box_remove(Evas_Object *obj, 649_sub_box_remove(Evas_Object *obj,
650 Efl_Ui_Layout_Object_Data *sd, 650 Efl_Ui_Layout_Data *sd,
651 Efl_Ui_Layout_Sub_Object_Data *sub_d) 651 Efl_Ui_Layout_Sub_Object_Data *sub_d)
652{ 652{
653 Evas_Object *child = sub_d->obj; /* sub_d will die in 653 Evas_Object *child = sub_d->obj; /* sub_d will die in
@@ -690,7 +690,7 @@ _sub_box_is(const Efl_Ui_Layout_Sub_Object_Data *sub_d)
690 690
691static Evas_Object * 691static Evas_Object *
692_sub_table_remove(Evas_Object *obj, 692_sub_table_remove(Evas_Object *obj,
693 Efl_Ui_Layout_Object_Data *sd, 693 Efl_Ui_Layout_Data *sd,
694 Efl_Ui_Layout_Sub_Object_Data *sub_d) 694 Efl_Ui_Layout_Sub_Object_Data *sub_d)
695{ 695{
696 Evas_Object *child; 696 Evas_Object *child;
@@ -722,7 +722,7 @@ _on_size_evaluate_signal(void *data,
722} 722}
723 723
724EOLIAN static void 724EOLIAN static void
725_efl_ui_layout_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Layout_Object_Data *_pd EINA_UNUSED) 725_efl_ui_layout_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED)
726{ 726{
727 Evas_Object *edje; 727 Evas_Object *edje;
728 728
@@ -747,7 +747,7 @@ _efl_ui_layout_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Layout_Object_Data *_p
747} 747}
748 748
749EOLIAN static void 749EOLIAN static void
750_efl_ui_layout_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Layout_Object_Data *sd) 750_efl_ui_layout_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Layout_Data *sd)
751{ 751{
752 Efl_Ui_Layout_Sub_Object_Data *sub_d; 752 Efl_Ui_Layout_Sub_Object_Data *sub_d;
753 Efl_Ui_Layout_Sub_Object_Cursor *pc; 753 Efl_Ui_Layout_Sub_Object_Cursor *pc;
@@ -813,7 +813,7 @@ _efl_ui_layout_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Layout_Object_Data *sd
813/* rewrite or extend this one on your derived class as to suit your 813/* rewrite or extend this one on your derived class as to suit your
814 * needs */ 814 * needs */
815EOLIAN static void 815EOLIAN static void
816_efl_ui_layout_object_efl_canvas_group_group_calculate(Eo *obj, Efl_Ui_Layout_Object_Data *sd) 816_efl_ui_layout_efl_canvas_group_group_calculate(Eo *obj, Efl_Ui_Layout_Data *sd)
817{ 817{
818 if (sd->needs_size_calc) 818 if (sd->needs_size_calc)
819 { 819 {
@@ -823,7 +823,7 @@ _efl_ui_layout_object_efl_canvas_group_group_calculate(Eo *obj, Efl_Ui_Layout_Ob
823} 823}
824 824
825static Efl_Ui_Layout_Sub_Object_Cursor * 825static Efl_Ui_Layout_Sub_Object_Cursor *
826_parts_cursors_find(Efl_Ui_Layout_Object_Data *sd, 826_parts_cursors_find(Efl_Ui_Layout_Data *sd,
827 const char *part) 827 const char *part)
828{ 828{
829 const Eina_List *l; 829 const Eina_List *l;
@@ -842,7 +842,7 @@ _parts_cursors_find(Efl_Ui_Layout_Object_Data *sd,
842 * widget inheriting from elm_layout */ 842 * widget inheriting from elm_layout */
843 843
844EOLIAN static Eina_Bool 844EOLIAN static Eina_Bool
845_efl_ui_layout_object_efl_file_file_set(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *file, const char *group) 845_efl_ui_layout_efl_file_file_set(Eo *obj, Efl_Ui_Layout_Data *sd, const char *file, const char *group)
846{ 846{
847 Eina_Bool int_ret = EINA_FALSE; 847 Eina_Bool int_ret = EINA_FALSE;
848 848
@@ -866,7 +866,7 @@ _efl_ui_layout_object_efl_file_file_set(Eo *obj, Efl_Ui_Layout_Object_Data *sd,
866} 866}
867 867
868EOLIAN static void 868EOLIAN static void
869_efl_ui_layout_object_efl_file_file_get(const Eo *obj, Efl_Ui_Layout_Object_Data *sd EINA_UNUSED, const char **file, const char **group) 869_efl_ui_layout_efl_file_file_get(const Eo *obj, Efl_Ui_Layout_Data *sd EINA_UNUSED, const char **file, const char **group)
870{ 870{
871 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 871 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
872 edje_object_file_get(wd->resize_obj, file, group); 872 edje_object_file_get(wd->resize_obj, file, group);
@@ -874,7 +874,7 @@ _efl_ui_layout_object_efl_file_file_get(const Eo *obj, Efl_Ui_Layout_Object_Data
874 874
875 875
876EOLIAN static Eina_Bool 876EOLIAN static Eina_Bool
877_efl_ui_layout_object_efl_file_mmap_set(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const Eina_File *file, const char *group) 877_efl_ui_layout_efl_file_mmap_set(Eo *obj, Efl_Ui_Layout_Data *sd, const Eina_File *file, const char *group)
878{ 878{
879 Eina_Bool int_ret = EINA_FALSE; 879 Eina_Bool int_ret = EINA_FALSE;
880 880
@@ -898,20 +898,20 @@ _efl_ui_layout_object_efl_file_mmap_set(Eo *obj, Efl_Ui_Layout_Object_Data *sd,
898} 898}
899 899
900EOLIAN static void 900EOLIAN static void
901_efl_ui_layout_object_efl_file_mmap_get(const Eo *obj, Efl_Ui_Layout_Object_Data *sd EINA_UNUSED, const Eina_File **file, const char **group) 901_efl_ui_layout_efl_file_mmap_get(const Eo *obj, Efl_Ui_Layout_Data *sd EINA_UNUSED, const Eina_File **file, const char **group)
902{ 902{
903 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 903 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
904 efl_file_mmap_get(wd->resize_obj, file, group); 904 efl_file_mmap_get(wd->resize_obj, file, group);
905} 905}
906 906
907EOLIAN static Efl_Ui_Theme_Apply 907EOLIAN static Efl_Ui_Theme_Apply
908_efl_ui_layout_object_theme_set(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *klass, const char *group, const char *style) 908_efl_ui_layout_theme_set(Eo *obj, Efl_Ui_Layout_Data *sd, const char *klass, const char *group, const char *style)
909{ 909{
910 Eina_Bool changed = EINA_FALSE; 910 Eina_Bool changed = EINA_FALSE;
911 911
912 if (!elm_widget_is_legacy(obj) && efl_finalized_get(obj)) 912 if (!elm_widget_is_legacy(obj) && efl_finalized_get(obj))
913 { 913 {
914 ERR("Efl.Ui.Layout.theme can only be set before finalize!"); 914 ERR("Efl.Ui.Layout_theme can only be set before finalize!");
915 return EFL_UI_THEME_APPLY_FAILED; 915 return EFL_UI_THEME_APPLY_FAILED;
916 } 916 }
917 917
@@ -927,7 +927,7 @@ _efl_ui_layout_object_theme_set(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const ch
927} 927}
928 928
929EOLIAN static void 929EOLIAN static void
930_efl_ui_layout_object_efl_layout_signal_signal_emit(Eo *obj, Efl_Ui_Layout_Object_Data *_pd EINA_UNUSED, const char *emission, const char *source) 930_efl_ui_layout_efl_layout_signal_signal_emit(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED, const char *emission, const char *source)
931{ 931{
932 // Don't do anything else than call forward here 932 // Don't do anything else than call forward here
933 EINA_SAFETY_ON_TRUE_RETURN(efl_invalidated_get(obj)); 933 EINA_SAFETY_ON_TRUE_RETURN(efl_invalidated_get(obj));
@@ -936,7 +936,7 @@ _efl_ui_layout_object_efl_layout_signal_signal_emit(Eo *obj, Efl_Ui_Layout_Objec
936} 936}
937 937
938EOLIAN static Eina_Bool 938EOLIAN static Eina_Bool
939_efl_ui_layout_object_efl_layout_signal_signal_callback_add(Eo *obj, Efl_Ui_Layout_Object_Data *_pd EINA_UNUSED, const char *emission, const char *source, Efl_Signal_Cb func, void *data) 939_efl_ui_layout_efl_layout_signal_signal_callback_add(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED, const char *emission, const char *source, Efl_Signal_Cb func, void *data)
940{ 940{
941 // Don't do anything else than call forward here 941 // Don't do anything else than call forward here
942 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); 942 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
@@ -944,7 +944,7 @@ _efl_ui_layout_object_efl_layout_signal_signal_callback_add(Eo *obj, Efl_Ui_Layo
944} 944}
945 945
946EOLIAN static Eina_Bool 946EOLIAN static Eina_Bool
947_efl_ui_layout_object_efl_layout_signal_signal_callback_del(Eo *obj, Efl_Ui_Layout_Object_Data *_pd EINA_UNUSED, const char *emission, const char *source, Edje_Signal_Cb func, void *data) 947_efl_ui_layout_efl_layout_signal_signal_callback_del(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED, const char *emission, const char *source, Edje_Signal_Cb func, void *data)
948{ 948{
949 // Don't do anything else than call forward here 949 // Don't do anything else than call forward here
950 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); 950 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
@@ -972,7 +972,7 @@ elm_layout_content_set(Evas_Object *obj, const char *swallow, Evas_Object *conte
972} 972}
973 973
974static Eina_Bool 974static Eina_Bool
975_efl_ui_layout_content_set(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, Evas_Object *content) 975_efl_ui_layout_content_set(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Evas_Object *content)
976{ 976{
977 Efl_Ui_Layout_Sub_Object_Data *sub_d; 977 Efl_Ui_Layout_Sub_Object_Data *sub_d;
978 Eina_List *l; 978 Eina_List *l;
@@ -1058,7 +1058,7 @@ elm_layout_content_get(const Evas_Object *obj, const char *swallow)
1058} 1058}
1059 1059
1060static Evas_Object* 1060static Evas_Object*
1061_efl_ui_layout_content_get(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part) 1061_efl_ui_layout_content_get(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part)
1062{ 1062{
1063 const Eina_List *l; 1063 const Eina_List *l;
1064 Efl_Ui_Layout_Sub_Object_Data *sub_d; 1064 Efl_Ui_Layout_Sub_Object_Data *sub_d;
@@ -1092,7 +1092,7 @@ elm_layout_content_unset(Evas_Object *obj, const char *swallow)
1092} 1092}
1093 1093
1094static Evas_Object* 1094static Evas_Object*
1095_efl_ui_layout_content_unset(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part) 1095_efl_ui_layout_content_unset(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part)
1096{ 1096{
1097 Efl_Ui_Layout_Sub_Object_Data *sub_d; 1097 Efl_Ui_Layout_Sub_Object_Data *sub_d;
1098 Eina_List *l; 1098 Eina_List *l;
@@ -1138,7 +1138,7 @@ _efl_ui_layout_content_unset(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char
1138} 1138}
1139 1139
1140EOLIAN static Eina_Bool 1140EOLIAN static Eina_Bool
1141_efl_ui_layout_object_efl_container_content_remove(Eo *obj, Efl_Ui_Layout_Object_Data *sd EINA_UNUSED, 1141_efl_ui_layout_efl_container_content_remove(Eo *obj, Efl_Ui_Layout_Data *sd EINA_UNUSED,
1142 Efl_Gfx_Entity *content) 1142 Efl_Gfx_Entity *content)
1143{ 1143{
1144 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); 1144 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
@@ -1161,7 +1161,7 @@ elm_layout_content_swallow_list_get(const Evas_Object *obj)
1161 EFL_UI_LAYOUT_CHECK(obj) NULL; 1161 EFL_UI_LAYOUT_CHECK(obj) NULL;
1162 Eina_List *ret = NULL; 1162 Eina_List *ret = NULL;
1163 Efl_Ui_Layout_Sub_Object_Data *sub_d = NULL; 1163 Efl_Ui_Layout_Sub_Object_Data *sub_d = NULL;
1164 Efl_Ui_Layout_Object_Data *sd = efl_data_scope_get(obj, MY_CLASS); 1164 Efl_Ui_Layout_Data *sd = efl_data_scope_get(obj, MY_CLASS);
1165 Eina_List *l = NULL; 1165 Eina_List *l = NULL;
1166 1166
1167 EINA_LIST_FOREACH(sd->subs, l, sub_d) 1167 EINA_LIST_FOREACH(sd->subs, l, sub_d)
@@ -1185,7 +1185,7 @@ _sub_iterator_next(Efl_Ui_Layout_Sub_Iterator *it, void **data)
1185 return EINA_TRUE; 1185 return EINA_TRUE;
1186} 1186}
1187 1187
1188static Efl_Ui_Layout_Object * 1188static Efl_Ui_Layout *
1189_sub_iterator_get_container(Efl_Ui_Layout_Sub_Iterator *it) 1189_sub_iterator_get_container(Efl_Ui_Layout_Sub_Iterator *it)
1190{ 1190{
1191 return it->object; 1191 return it->object;
@@ -1199,7 +1199,7 @@ _sub_iterator_free(Efl_Ui_Layout_Sub_Iterator *it)
1199} 1199}
1200 1200
1201static Eina_Iterator * 1201static Eina_Iterator *
1202_sub_iterator_create(Eo *eo_obj, Efl_Ui_Layout_Object_Data *sd) 1202_sub_iterator_create(Eo *eo_obj, Efl_Ui_Layout_Data *sd)
1203{ 1203{
1204 Efl_Ui_Layout_Sub_Iterator *it; 1204 Efl_Ui_Layout_Sub_Iterator *it;
1205 1205
@@ -1219,19 +1219,19 @@ _sub_iterator_create(Eo *eo_obj, Efl_Ui_Layout_Object_Data *sd)
1219} 1219}
1220 1220
1221EOLIAN static Eina_Iterator * 1221EOLIAN static Eina_Iterator *
1222_efl_ui_layout_object_efl_container_content_iterate(Eo *eo_obj EINA_UNUSED, Efl_Ui_Layout_Object_Data *sd) 1222_efl_ui_layout_efl_container_content_iterate(Eo *eo_obj EINA_UNUSED, Efl_Ui_Layout_Data *sd)
1223{ 1223{
1224 return _sub_iterator_create(eo_obj, sd); 1224 return _sub_iterator_create(eo_obj, sd);
1225} 1225}
1226 1226
1227EOLIAN static int 1227EOLIAN static int
1228_efl_ui_layout_object_efl_container_content_count(Eo *eo_obj EINA_UNUSED, Efl_Ui_Layout_Object_Data *sd) 1228_efl_ui_layout_efl_container_content_count(Eo *eo_obj EINA_UNUSED, Efl_Ui_Layout_Data *sd)
1229{ 1229{
1230 return eina_list_count(sd->subs); 1230 return eina_list_count(sd->subs);
1231} 1231}
1232 1232
1233static Eina_Bool 1233static Eina_Bool
1234_efl_ui_layout_text_generic_set(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, const char *text, Eina_Bool is_markup) 1234_efl_ui_layout_text_generic_set(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, const char *text, Eina_Bool is_markup)
1235{ 1235{
1236 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); 1236 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
1237 1237
@@ -1312,13 +1312,13 @@ _efl_ui_layout_text_generic_set(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const ch
1312} 1312}
1313 1313
1314static Eina_Bool 1314static Eina_Bool
1315_efl_ui_layout_text_set(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, const char *text) 1315_efl_ui_layout_text_set(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, const char *text)
1316{ 1316{
1317 return _efl_ui_layout_text_generic_set(obj, sd, part, text, EINA_FALSE); 1317 return _efl_ui_layout_text_generic_set(obj, sd, part, text, EINA_FALSE);
1318} 1318}
1319 1319
1320static const char* 1320static const char*
1321_efl_ui_layout_text_get(Eo *obj, Efl_Ui_Layout_Object_Data *sd EINA_UNUSED, const char *part) 1321_efl_ui_layout_text_get(Eo *obj, Efl_Ui_Layout_Data *sd EINA_UNUSED, const char *part)
1322{ 1322{
1323 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL); 1323 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL);
1324 1324
@@ -1330,7 +1330,7 @@ _efl_ui_layout_text_get(Eo *obj, Efl_Ui_Layout_Object_Data *sd EINA_UNUSED, cons
1330} 1330}
1331 1331
1332static const char* 1332static const char*
1333_efl_ui_layout_text_markup_get(Eo *obj, Efl_Ui_Layout_Object_Data *sd EINA_UNUSED, const char *part) 1333_efl_ui_layout_text_markup_get(Eo *obj, Efl_Ui_Layout_Data *sd EINA_UNUSED, const char *part)
1334{ 1334{
1335 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL); 1335 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL);
1336 1336
@@ -1338,13 +1338,13 @@ _efl_ui_layout_text_markup_get(Eo *obj, Efl_Ui_Layout_Object_Data *sd EINA_UNUSE
1338} 1338}
1339 1339
1340static Eina_Bool 1340static Eina_Bool
1341_efl_ui_layout_text_markup_set(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, const char *text) 1341_efl_ui_layout_text_markup_set(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, const char *text)
1342{ 1342{
1343 return _efl_ui_layout_text_generic_set(obj, sd, part, text, EINA_TRUE); 1343 return _efl_ui_layout_text_generic_set(obj, sd, part, text, EINA_TRUE);
1344} 1344}
1345 1345
1346static void 1346static void
1347_layout_box_subobj_init(Efl_Ui_Layout_Object_Data *sd, Efl_Ui_Layout_Sub_Object_Data *sub_d, const char *part, Evas_Object *child) 1347_layout_box_subobj_init(Efl_Ui_Layout_Data *sd, Efl_Ui_Layout_Sub_Object_Data *sub_d, const char *part, Evas_Object *child)
1348{ 1348{
1349 sub_d->part = eina_stringshare_add(part); 1349 sub_d->part = eina_stringshare_add(part);
1350 sub_d->obj = child; 1350 sub_d->obj = child;
@@ -1353,7 +1353,7 @@ _layout_box_subobj_init(Efl_Ui_Layout_Object_Data *sd, Efl_Ui_Layout_Sub_Object_
1353} 1353}
1354 1354
1355Eina_Bool 1355Eina_Bool
1356_efl_ui_layout_box_append(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, Evas_Object *child) 1356_efl_ui_layout_box_append(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Evas_Object *child)
1357{ 1357{
1358 Efl_Ui_Layout_Sub_Object_Data *sub_d; 1358 Efl_Ui_Layout_Sub_Object_Data *sub_d;
1359 1359
@@ -1390,7 +1390,7 @@ _efl_ui_layout_box_append(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *pa
1390} 1390}
1391 1391
1392Eina_Bool 1392Eina_Bool
1393_efl_ui_layout_box_prepend(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, Evas_Object *child) 1393_efl_ui_layout_box_prepend(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Evas_Object *child)
1394{ 1394{
1395 Efl_Ui_Layout_Sub_Object_Data *sub_d; 1395 Efl_Ui_Layout_Sub_Object_Data *sub_d;
1396 1396
@@ -1427,7 +1427,7 @@ _efl_ui_layout_box_prepend(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *p
1427} 1427}
1428 1428
1429Eina_Bool 1429Eina_Bool
1430_efl_ui_layout_box_insert_before(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, Evas_Object *child, const Evas_Object *reference) 1430_efl_ui_layout_box_insert_before(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Evas_Object *child, const Evas_Object *reference)
1431{ 1431{
1432 Efl_Ui_Layout_Sub_Object_Data *sub_d; 1432 Efl_Ui_Layout_Sub_Object_Data *sub_d;
1433 1433
@@ -1469,7 +1469,7 @@ _efl_ui_layout_box_insert_before(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const c
1469} 1469}
1470 1470
1471Eina_Bool 1471Eina_Bool
1472_efl_ui_layout_box_insert_at(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, Evas_Object *child, unsigned int pos) 1472_efl_ui_layout_box_insert_at(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Evas_Object *child, unsigned int pos)
1473{ 1473{
1474 Efl_Ui_Layout_Sub_Object_Data *sub_d; 1474 Efl_Ui_Layout_Sub_Object_Data *sub_d;
1475 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); 1475 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
@@ -1507,7 +1507,7 @@ _efl_ui_layout_box_insert_at(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char
1507} 1507}
1508 1508
1509Evas_Object * 1509Evas_Object *
1510_efl_ui_layout_box_remove(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, Evas_Object *child) 1510_efl_ui_layout_box_remove(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Evas_Object *child)
1511{ 1511{
1512 1512
1513 EINA_SAFETY_ON_NULL_RETURN_VAL(part, NULL); 1513 EINA_SAFETY_ON_NULL_RETURN_VAL(part, NULL);
@@ -1528,7 +1528,7 @@ _efl_ui_layout_box_remove(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *pa
1528} 1528}
1529 1529
1530Eina_Bool 1530Eina_Bool
1531_efl_ui_layout_box_remove_all(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, Eina_Bool clear) 1531_efl_ui_layout_box_remove_all(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Eina_Bool clear)
1532{ 1532{
1533 EINA_SAFETY_ON_NULL_RETURN_VAL(part, EINA_FALSE); 1533 EINA_SAFETY_ON_NULL_RETURN_VAL(part, EINA_FALSE);
1534 1534
@@ -1558,7 +1558,7 @@ _efl_ui_layout_box_remove_all(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char
1558} 1558}
1559 1559
1560Eina_Bool 1560Eina_Bool
1561_efl_ui_layout_table_pack(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, Evas_Object *child, unsigned short col, unsigned short row, unsigned short colspan, unsigned short rowspan) 1561_efl_ui_layout_table_pack(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Evas_Object *child, unsigned short col, unsigned short row, unsigned short colspan, unsigned short rowspan)
1562{ 1562{
1563 Efl_Ui_Layout_Sub_Object_Data *sub_d; 1563 Efl_Ui_Layout_Sub_Object_Data *sub_d;
1564 1564
@@ -1605,7 +1605,7 @@ _efl_ui_layout_table_pack(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *pa
1605} 1605}
1606 1606
1607Evas_Object * 1607Evas_Object *
1608_efl_ui_layout_table_unpack(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, Evas_Object *child) 1608_efl_ui_layout_table_unpack(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Evas_Object *child)
1609{ 1609{
1610 1610
1611 EINA_SAFETY_ON_NULL_RETURN_VAL(part, NULL); 1611 EINA_SAFETY_ON_NULL_RETURN_VAL(part, NULL);
@@ -1627,7 +1627,7 @@ _efl_ui_layout_table_unpack(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *
1627} 1627}
1628 1628
1629Eina_Bool 1629Eina_Bool
1630_efl_ui_layout_table_clear(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, Eina_Bool clear) 1630_efl_ui_layout_table_clear(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Eina_Bool clear)
1631{ 1631{
1632 EINA_SAFETY_ON_NULL_RETURN_VAL(part, EINA_FALSE); 1632 EINA_SAFETY_ON_NULL_RETURN_VAL(part, EINA_FALSE);
1633 1633
@@ -1665,7 +1665,7 @@ elm_layout_edje_get(const Eo *obj)
1665} 1665}
1666 1666
1667EOLIAN static const char * 1667EOLIAN static const char *
1668_efl_ui_layout_object_efl_layout_group_group_data_get(const Eo *obj, Efl_Ui_Layout_Object_Data *_pd EINA_UNUSED, const char *key) 1668_efl_ui_layout_efl_layout_group_group_data_get(const Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED, const char *key)
1669{ 1669{
1670 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL); 1670 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL);
1671 1671
@@ -1673,7 +1673,7 @@ _efl_ui_layout_object_efl_layout_group_group_data_get(const Eo *obj, Efl_Ui_Layo
1673} 1673}
1674 1674
1675EOLIAN static Eina_Size2D 1675EOLIAN static Eina_Size2D
1676_efl_ui_layout_object_efl_layout_group_group_size_min_get(const Eo *obj, Efl_Ui_Layout_Object_Data *_pd EINA_UNUSED) 1676_efl_ui_layout_efl_layout_group_group_size_min_get(const Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED)
1677{ 1677{
1678 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_SIZE2D(0, 0)); 1678 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_SIZE2D(0, 0));
1679 1679
@@ -1681,7 +1681,7 @@ _efl_ui_layout_object_efl_layout_group_group_size_min_get(const Eo *obj, Efl_Ui_
1681} 1681}
1682 1682
1683EOLIAN static Eina_Size2D 1683EOLIAN static Eina_Size2D
1684_efl_ui_layout_object_efl_layout_group_group_size_max_get(const Eo *obj, Efl_Ui_Layout_Object_Data *_pd EINA_UNUSED) 1684_efl_ui_layout_efl_layout_group_group_size_max_get(const Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED)
1685{ 1685{
1686 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_SIZE2D(0, 0)); 1686 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_SIZE2D(0, 0));
1687 1687
@@ -1689,7 +1689,7 @@ _efl_ui_layout_object_efl_layout_group_group_size_max_get(const Eo *obj, Efl_Ui_
1689} 1689}
1690 1690
1691EOLIAN static Eina_Bool 1691EOLIAN static Eina_Bool
1692_efl_ui_layout_object_efl_layout_group_part_exist_get(const Eo *obj, Efl_Ui_Layout_Object_Data *_pd EINA_UNUSED, const char *part) 1692_efl_ui_layout_efl_layout_group_part_exist_get(const Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED, const char *part)
1693{ 1693{
1694 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); 1694 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
1695 1695
@@ -1701,7 +1701,7 @@ _efl_ui_layout_object_efl_layout_group_part_exist_get(const Eo *obj, Efl_Ui_Layo
1701 * Evas's rendering phase, it will be addressed, finally (see 1701 * Evas's rendering phase, it will be addressed, finally (see
1702 * _efl_ui_layout_smart_calculate()). */ 1702 * _efl_ui_layout_smart_calculate()). */
1703static void 1703static void
1704_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Layout_Object_Data *sd) 1704_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Layout_Data *sd)
1705{ 1705{
1706 if (!efl_finalized_get(obj)) return; 1706 if (!efl_finalized_get(obj)) return;
1707 if (sd->frozen) return; 1707 if (sd->frozen) return;
@@ -1714,7 +1714,7 @@ _elm_layout_sizing_eval(Eo *obj, Efl_Ui_Layout_Object_Data *sd)
1714EAPI void 1714EAPI void
1715elm_layout_sizing_restricted_eval(Eo *obj, Eina_Bool w, Eina_Bool h) 1715elm_layout_sizing_restricted_eval(Eo *obj, Eina_Bool w, Eina_Bool h)
1716{ 1716{
1717 Efl_Ui_Layout_Object_Data *sd = efl_data_scope_safe_get(obj, MY_CLASS); 1717 Efl_Ui_Layout_Data *sd = efl_data_scope_safe_get(obj, MY_CLASS);
1718 1718
1719 if (!sd) return; 1719 if (!sd) return;
1720 sd->restricted_calc_w = !!w; 1720 sd->restricted_calc_w = !!w;
@@ -1724,7 +1724,7 @@ elm_layout_sizing_restricted_eval(Eo *obj, Eina_Bool w, Eina_Bool h)
1724} 1724}
1725 1725
1726EOLIAN static int 1726EOLIAN static int
1727_efl_ui_layout_object_efl_layout_calc_calc_freeze(Eo *obj, Efl_Ui_Layout_Object_Data *sd) 1727_efl_ui_layout_efl_layout_calc_calc_freeze(Eo *obj, Efl_Ui_Layout_Data *sd)
1728{ 1728{
1729 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, 0); 1729 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, 0);
1730 1730
@@ -1736,7 +1736,7 @@ _efl_ui_layout_object_efl_layout_calc_calc_freeze(Eo *obj, Efl_Ui_Layout_Object_
1736} 1736}
1737 1737
1738EOLIAN static int 1738EOLIAN static int
1739_efl_ui_layout_object_efl_layout_calc_calc_thaw(Eo *obj, Efl_Ui_Layout_Object_Data *sd) 1739_efl_ui_layout_efl_layout_calc_calc_thaw(Eo *obj, Efl_Ui_Layout_Data *sd)
1740{ 1740{
1741 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, 0); 1741 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, 0);
1742 1742
@@ -1750,7 +1750,7 @@ _efl_ui_layout_object_efl_layout_calc_calc_thaw(Eo *obj, Efl_Ui_Layout_Object_Da
1750} 1750}
1751 1751
1752static Eina_Bool 1752static Eina_Bool
1753_efl_ui_layout_part_cursor_set(Efl_Ui_Layout_Object_Data *sd, const char *part_name, const char *cursor) 1753_efl_ui_layout_part_cursor_set(Efl_Ui_Layout_Data *sd, const char *part_name, const char *cursor)
1754{ 1754{
1755 Evas_Object *part_obj; 1755 Evas_Object *part_obj;
1756 Efl_Ui_Layout_Sub_Object_Cursor *pc; 1756 Efl_Ui_Layout_Sub_Object_Cursor *pc;
@@ -1809,7 +1809,7 @@ _efl_ui_layout_part_cursor_set(Efl_Ui_Layout_Object_Data *sd, const char *part_n
1809} 1809}
1810 1810
1811static const char * 1811static const char *
1812_efl_ui_layout_part_cursor_get(Efl_Ui_Layout_Object_Data *sd, const char *part_name) 1812_efl_ui_layout_part_cursor_get(Efl_Ui_Layout_Data *sd, const char *part_name)
1813{ 1813{
1814 EINA_SAFETY_ON_NULL_RETURN_VAL(part_name, NULL); 1814 EINA_SAFETY_ON_NULL_RETURN_VAL(part_name, NULL);
1815 1815
@@ -1821,7 +1821,7 @@ _efl_ui_layout_part_cursor_get(Efl_Ui_Layout_Object_Data *sd, const char *part_n
1821} 1821}
1822 1822
1823static Eina_Bool 1823static Eina_Bool
1824_efl_ui_layout_part_cursor_unset(Efl_Ui_Layout_Object_Data *sd, const char *part_name) 1824_efl_ui_layout_part_cursor_unset(Efl_Ui_Layout_Data *sd, const char *part_name)
1825{ 1825{
1826 EINA_SAFETY_ON_NULL_RETURN_VAL(part_name, EINA_FALSE); 1826 EINA_SAFETY_ON_NULL_RETURN_VAL(part_name, EINA_FALSE);
1827 1827
@@ -1843,7 +1843,7 @@ _efl_ui_layout_part_cursor_unset(Efl_Ui_Layout_Object_Data *sd, const char *part
1843} 1843}
1844 1844
1845static Eina_Bool 1845static Eina_Bool
1846_efl_ui_layout_part_cursor_style_set(Efl_Ui_Layout_Object_Data *sd, const char *part_name, const char *style) 1846_efl_ui_layout_part_cursor_style_set(Efl_Ui_Layout_Data *sd, const char *part_name, const char *style)
1847{ 1847{
1848 EINA_SAFETY_ON_NULL_RETURN_VAL(part_name, EINA_FALSE); 1848 EINA_SAFETY_ON_NULL_RETURN_VAL(part_name, EINA_FALSE);
1849 1849
@@ -1858,7 +1858,7 @@ _efl_ui_layout_part_cursor_style_set(Efl_Ui_Layout_Object_Data *sd, const char *
1858} 1858}
1859 1859
1860static const char* 1860static const char*
1861_efl_ui_layout_part_cursor_style_get(Efl_Ui_Layout_Object_Data *sd, const char *part_name) 1861_efl_ui_layout_part_cursor_style_get(Efl_Ui_Layout_Data *sd, const char *part_name)
1862{ 1862{
1863 EINA_SAFETY_ON_NULL_RETURN_VAL(part_name, NULL); 1863 EINA_SAFETY_ON_NULL_RETURN_VAL(part_name, NULL);
1864 1864
@@ -1870,7 +1870,7 @@ _efl_ui_layout_part_cursor_style_get(Efl_Ui_Layout_Object_Data *sd, const char *
1870} 1870}
1871 1871
1872static Eina_Bool 1872static Eina_Bool
1873_efl_ui_layout_part_cursor_engine_only_set(Efl_Ui_Layout_Object_Data *sd, const char *part_name, Eina_Bool engine_only) 1873_efl_ui_layout_part_cursor_engine_only_set(Efl_Ui_Layout_Data *sd, const char *part_name, Eina_Bool engine_only)
1874{ 1874{
1875 EINA_SAFETY_ON_NULL_RETURN_VAL(part_name, EINA_FALSE); 1875 EINA_SAFETY_ON_NULL_RETURN_VAL(part_name, EINA_FALSE);
1876 1876
@@ -1885,7 +1885,7 @@ _efl_ui_layout_part_cursor_engine_only_set(Efl_Ui_Layout_Object_Data *sd, const
1885} 1885}
1886 1886
1887static Eina_Bool 1887static Eina_Bool
1888_efl_ui_layout_part_cursor_engine_only_get(Efl_Ui_Layout_Object_Data *sd, const char *part_name) 1888_efl_ui_layout_part_cursor_engine_only_get(Efl_Ui_Layout_Data *sd, const char *part_name)
1889{ 1889{
1890 EINA_SAFETY_ON_NULL_RETURN_VAL(part_name, EINA_FALSE); 1890 EINA_SAFETY_ON_NULL_RETURN_VAL(part_name, EINA_FALSE);
1891 1891
@@ -1899,7 +1899,7 @@ _efl_ui_layout_part_cursor_engine_only_get(Efl_Ui_Layout_Object_Data *sd, const
1899EAPI Eina_Bool 1899EAPI Eina_Bool
1900elm_layout_edje_object_can_access_set(Eo *obj, Eina_Bool can_access) 1900elm_layout_edje_object_can_access_set(Eo *obj, Eina_Bool can_access)
1901{ 1901{
1902 Efl_Ui_Layout_Object_Data *sd = efl_data_scope_safe_get(obj, MY_CLASS); 1902 Efl_Ui_Layout_Data *sd = efl_data_scope_safe_get(obj, MY_CLASS);
1903 EINA_SAFETY_ON_NULL_RETURN_VAL(sd, EINA_FALSE); 1903 EINA_SAFETY_ON_NULL_RETURN_VAL(sd, EINA_FALSE);
1904 sd->can_access = !!can_access; 1904 sd->can_access = !!can_access;
1905 return EINA_TRUE; 1905 return EINA_TRUE;
@@ -1908,13 +1908,13 @@ elm_layout_edje_object_can_access_set(Eo *obj, Eina_Bool can_access)
1908EAPI Eina_Bool 1908EAPI Eina_Bool
1909elm_layout_edje_object_can_access_get(const Eo *obj) 1909elm_layout_edje_object_can_access_get(const Eo *obj)
1910{ 1910{
1911 Efl_Ui_Layout_Object_Data *sd = efl_data_scope_safe_get(obj, MY_CLASS); 1911 Efl_Ui_Layout_Data *sd = efl_data_scope_safe_get(obj, MY_CLASS);
1912 EINA_SAFETY_ON_NULL_RETURN_VAL(sd, EINA_FALSE); 1912 EINA_SAFETY_ON_NULL_RETURN_VAL(sd, EINA_FALSE);
1913 return sd->can_access; 1913 return sd->can_access;
1914} 1914}
1915 1915
1916EOLIAN static void 1916EOLIAN static void
1917_efl_ui_layout_efl_object_dbg_info_get(Eo *eo_obj, Efl_Ui_Layout_Object_Data *_pd EINA_UNUSED, Efl_Dbg_Info *root) 1917_efl_ui_layout_efl_object_dbg_info_get(Eo *eo_obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED, Efl_Dbg_Info *root)
1918{ 1918{
1919 efl_dbg_info_get(efl_super(eo_obj, MY_CLASS), root); 1919 efl_dbg_info_get(efl_super(eo_obj, MY_CLASS), root);
1920 ELM_WIDGET_DATA_GET_OR_RETURN(eo_obj, wd); 1920 ELM_WIDGET_DATA_GET_OR_RETURN(eo_obj, wd);
@@ -1940,7 +1940,7 @@ _efl_ui_layout_efl_object_dbg_info_get(Eo *eo_obj, Efl_Ui_Layout_Object_Data *_p
1940} 1940}
1941 1941
1942static void 1942static void
1943_efl_ui_layout_view_model_property_update(Efl_Ui_Layout_Object_Data *pd, const char *part, const char *fetch) 1943_efl_ui_layout_view_model_property_update(Efl_Ui_Layout_Data *pd, const char *part, const char *fetch)
1944{ 1944{
1945 Eina_Value *v = NULL; 1945 Eina_Value *v = NULL;
1946 char *value = NULL; 1946 char *value = NULL;
@@ -1960,7 +1960,7 @@ _efl_ui_layout_view_model_property_update(Efl_Ui_Layout_Object_Data *pd, const c
1960} 1960}
1961 1961
1962static void 1962static void
1963_efl_ui_layout_view_model_signal_update(Efl_Ui_Layout_Object_Data *pd, const char *signal, const char *fetch) 1963_efl_ui_layout_view_model_signal_update(Efl_Ui_Layout_Data *pd, const char *signal, const char *fetch)
1964{ 1964{
1965 Eina_Value *v = NULL; 1965 Eina_Value *v = NULL;
1966 Eina_Strbuf *buf; 1966 Eina_Strbuf *buf;
@@ -2004,7 +2004,7 @@ _efl_ui_layout_view_model_signal_update(Efl_Ui_Layout_Object_Data *pd, const cha
2004} 2004}
2005 2005
2006static void 2006static void
2007_efl_ui_layout_view_model_content_update(Efl_Ui_Layout_Object_Data *pd, Efl_Ui_Factory *factory, const char *name) 2007_efl_ui_layout_view_model_content_update(Efl_Ui_Layout_Data *pd, Efl_Ui_Factory *factory, const char *name)
2008{ 2008{
2009 Efl_Gfx_Entity *content; 2009 Efl_Gfx_Entity *content;
2010 2010
@@ -2013,7 +2013,7 @@ _efl_ui_layout_view_model_content_update(Efl_Ui_Layout_Object_Data *pd, Efl_Ui_F
2013} 2013}
2014 2014
2015static void 2015static void
2016_efl_ui_layout_view_model_update(Efl_Ui_Layout_Object_Data *pd) 2016_efl_ui_layout_view_model_update(Efl_Ui_Layout_Data *pd)
2017{ 2017{
2018 Eina_Hash_Tuple *tuple; 2018 Eina_Hash_Tuple *tuple;
2019 Eina_Iterator *it; 2019 Eina_Iterator *it;
@@ -2040,7 +2040,7 @@ static void
2040_efl_model_properties_changed_cb(void *data, const Efl_Event *event) 2040_efl_model_properties_changed_cb(void *data, const Efl_Event *event)
2041{ 2041{
2042 Efl_Model_Property_Event *evt = event->info; 2042 Efl_Model_Property_Event *evt = event->info;
2043 Efl_Ui_Layout_Object_Data *pd = data; 2043 Efl_Ui_Layout_Data *pd = data;
2044 const char *prop; 2044 const char *prop;
2045 Eina_Array_Iterator it; 2045 Eina_Array_Iterator it;
2046 unsigned int i; 2046 unsigned int i;
@@ -2068,7 +2068,7 @@ _efl_model_properties_changed_cb(void *data, const Efl_Event *event)
2068} 2068}
2069 2069
2070static void 2070static void
2071_efl_ui_layout_connect_hash(Efl_Ui_Layout_Object_Data *pd) 2071_efl_ui_layout_connect_hash(Efl_Ui_Layout_Data *pd)
2072{ 2072{
2073 if (pd->connect.properties) return ; 2073 if (pd->connect.properties) return ;
2074 2074
@@ -2079,7 +2079,7 @@ _efl_ui_layout_connect_hash(Efl_Ui_Layout_Object_Data *pd)
2079} 2079}
2080 2080
2081EOLIAN static void 2081EOLIAN static void
2082_efl_ui_layout_object_efl_ui_view_model_set(Eo *obj, Efl_Ui_Layout_Object_Data *pd, Efl_Model *model) 2082_efl_ui_layout_efl_ui_view_model_set(Eo *obj, Efl_Ui_Layout_Data *pd, Efl_Model *model)
2083{ 2083{
2084 Eina_Stringshare *name; 2084 Eina_Stringshare *name;
2085 Eina_Hash_Tuple *tuple; 2085 Eina_Hash_Tuple *tuple;
@@ -2123,13 +2123,13 @@ _efl_ui_layout_object_efl_ui_view_model_set(Eo *obj, Efl_Ui_Layout_Object_Data *
2123} 2123}
2124 2124
2125EOLIAN static Efl_Model * 2125EOLIAN static Efl_Model *
2126_efl_ui_layout_object_efl_ui_view_model_get(const Eo *obj EINA_UNUSED, Efl_Ui_Layout_Object_Data *pd) 2126_efl_ui_layout_efl_ui_view_model_get(const Eo *obj EINA_UNUSED, Efl_Ui_Layout_Data *pd)
2127{ 2127{
2128 return pd->connect.model; 2128 return pd->connect.model;
2129} 2129}
2130 2130
2131EOLIAN static void 2131EOLIAN static void
2132_efl_ui_layout_object_efl_ui_model_connect_connect(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Object_Data *pd, const char *name, const char *property) 2132_efl_ui_layout_efl_ui_model_connect_connect(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Data *pd, const char *name, const char *property)
2133{ 2133{
2134 EINA_SAFETY_ON_NULL_RETURN(name); 2134 EINA_SAFETY_ON_NULL_RETURN(name);
2135 Eina_Stringshare *sprop; 2135 Eina_Stringshare *sprop;
@@ -2178,7 +2178,7 @@ _efl_ui_layout_object_efl_ui_model_connect_connect(Eo *obj EINA_UNUSED, Efl_Ui_L
2178} 2178}
2179 2179
2180EOLIAN static void 2180EOLIAN static void
2181_efl_ui_layout_object_efl_ui_factory_model_connect(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Object_Data *pd, 2181_efl_ui_layout_efl_ui_factory_model_connect(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Data *pd,
2182 const char *name, Efl_Ui_Factory *factory) 2182 const char *name, Efl_Ui_Factory *factory)
2183{ 2183{
2184 EINA_SAFETY_ON_NULL_RETURN(name); 2184 EINA_SAFETY_ON_NULL_RETURN(name);
@@ -2210,7 +2210,7 @@ _efl_ui_layout_object_efl_ui_factory_model_connect(Eo *obj EINA_UNUSED, Efl_Ui_L
2210} 2210}
2211 2211
2212EOLIAN static Eo * 2212EOLIAN static Eo *
2213_efl_ui_layout_object_efl_object_constructor(Eo *obj, Efl_Ui_Layout_Object_Data *sd) 2213_efl_ui_layout_efl_object_constructor(Eo *obj, Efl_Ui_Layout_Data *sd)
2214{ 2214{
2215 sd->obj = obj; 2215 sd->obj = obj;
2216 obj = efl_constructor(efl_super(obj, MY_CLASS)); 2216 obj = efl_constructor(efl_super(obj, MY_CLASS));
@@ -2221,7 +2221,7 @@ _efl_ui_layout_object_efl_object_constructor(Eo *obj, Efl_Ui_Layout_Object_Data
2221} 2221}
2222 2222
2223EOLIAN static Efl_Object* 2223EOLIAN static Efl_Object*
2224_efl_ui_layout_object_efl_object_finalize(Eo *obj, Efl_Ui_Layout_Object_Data *pd EINA_UNUSED) 2224_efl_ui_layout_efl_object_finalize(Eo *obj, Efl_Ui_Layout_Data *pd EINA_UNUSED)
2225{ 2225{
2226 Eo *eo; 2226 Eo *eo;
2227 2227
@@ -2232,14 +2232,14 @@ _efl_ui_layout_object_efl_object_finalize(Eo *obj, Efl_Ui_Layout_Object_Data *pd
2232} 2232}
2233 2233
2234EOLIAN static void 2234EOLIAN static void
2235_efl_ui_layout_object_efl_layout_signal_message_send(Eo *obj, Efl_Ui_Layout_Object_Data *pd EINA_UNUSED, int id, const Eina_Value msg) 2235_efl_ui_layout_efl_layout_signal_message_send(Eo *obj, Efl_Ui_Layout_Data *pd EINA_UNUSED, int id, const Eina_Value msg)
2236{ 2236{
2237 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 2237 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
2238 efl_layout_signal_message_send(wd->resize_obj, id, msg); 2238 efl_layout_signal_message_send(wd->resize_obj, id, msg);
2239} 2239}
2240 2240
2241EOLIAN static void 2241EOLIAN static void
2242_efl_ui_layout_object_efl_layout_signal_signal_process(Eo *obj, Efl_Ui_Layout_Object_Data *pd EINA_UNUSED, Eina_Bool recurse) 2242_efl_ui_layout_efl_layout_signal_signal_process(Eo *obj, Efl_Ui_Layout_Data *pd EINA_UNUSED, Eina_Bool recurse)
2243{ 2243{
2244 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 2244 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
2245 efl_layout_signal_process(wd->resize_obj, recurse); 2245 efl_layout_signal_process(wd->resize_obj, recurse);
@@ -2248,7 +2248,7 @@ _efl_ui_layout_object_efl_layout_signal_signal_process(Eo *obj, Efl_Ui_Layout_Ob
2248/* Efl.Part implementation */ 2248/* Efl.Part implementation */
2249 2249
2250EOLIAN static Eo * 2250EOLIAN static Eo *
2251_efl_ui_layout_object_efl_part_part_get(const Eo *obj, Efl_Ui_Layout_Object_Data *sd EINA_UNUSED, const char *part) 2251_efl_ui_layout_efl_part_part_get(const Eo *obj, Efl_Ui_Layout_Data *sd EINA_UNUSED, const char *part)
2252{ 2252{
2253 Efl_Canvas_Layout_Part_Type type = EFL_CANVAS_LAYOUT_PART_TYPE_NONE; 2253 Efl_Canvas_Layout_Part_Type type = EFL_CANVAS_LAYOUT_PART_TYPE_NONE;
2254 2254
@@ -2313,7 +2313,7 @@ _efl_ui_layout_object_efl_part_part_get(const Eo *obj, Efl_Ui_Layout_Object_Data
2313} 2313}
2314 2314
2315static const char * 2315static const char *
2316_efl_ui_layout_default_content_part_get(const Eo *obj, Efl_Ui_Layout_Object_Data *sd EINA_UNUSED) 2316_efl_ui_layout_default_content_part_get(const Eo *obj, Efl_Ui_Layout_Data *sd EINA_UNUSED)
2317{ 2317{
2318 const char *part = NULL; 2318 const char *part = NULL;
2319 if (!_elm_layout_part_aliasing_eval(obj, &part, EINA_FALSE)) 2319 if (!_elm_layout_part_aliasing_eval(obj, &part, EINA_FALSE))
@@ -2322,7 +2322,7 @@ _efl_ui_layout_default_content_part_get(const Eo *obj, Efl_Ui_Layout_Object_Data
2322} 2322}
2323 2323
2324static const char * 2324static const char *
2325_efl_ui_layout_default_text_part_get(const Eo *obj, Efl_Ui_Layout_Object_Data *sd EINA_UNUSED) 2325_efl_ui_layout_default_text_part_get(const Eo *obj, Efl_Ui_Layout_Data *sd EINA_UNUSED)
2326{ 2326{
2327 const char *part = NULL; 2327 const char *part = NULL;
2328 if (!_elm_layout_part_aliasing_eval(obj, &part, EINA_TRUE)) 2328 if (!_elm_layout_part_aliasing_eval(obj, &part, EINA_TRUE))
@@ -2330,13 +2330,13 @@ _efl_ui_layout_default_text_part_get(const Eo *obj, Efl_Ui_Layout_Object_Data *s
2330 return part; 2330 return part;
2331} 2331}
2332 2332
2333/* Efl.Ui.Layout.Part (common) */ 2333/* Efl.Ui.Layout_Part (common) */
2334 2334
2335EOLIAN static Eina_Bool 2335EOLIAN static Eina_Bool
2336_efl_ui_layout_part_efl_ui_cursor_cursor_set(Eo *obj, void *_pd EINA_UNUSED, const char *cursor) 2336_efl_ui_layout_part_efl_ui_cursor_cursor_set(Eo *obj, void *_pd EINA_UNUSED, const char *cursor)
2337{ 2337{
2338 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS); 2338 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS);
2339 Efl_Ui_Layout_Object_Data *sd = efl_data_scope_get(pd->obj, MY_CLASS); 2339 Efl_Ui_Layout_Data *sd = efl_data_scope_get(pd->obj, MY_CLASS);
2340 return _efl_ui_layout_part_cursor_set(sd, pd->part, cursor); 2340 return _efl_ui_layout_part_cursor_set(sd, pd->part, cursor);
2341} 2341}
2342 2342
@@ -2344,7 +2344,7 @@ EOLIAN static const char *
2344_efl_ui_layout_part_efl_ui_cursor_cursor_get(const Eo *obj, void *_pd EINA_UNUSED) 2344_efl_ui_layout_part_efl_ui_cursor_cursor_get(const Eo *obj, void *_pd EINA_UNUSED)
2345{ 2345{
2346 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS); 2346 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS);
2347 Efl_Ui_Layout_Object_Data *sd = efl_data_scope_get(pd->obj, MY_CLASS); 2347 Efl_Ui_Layout_Data *sd = efl_data_scope_get(pd->obj, MY_CLASS);
2348 return _efl_ui_layout_part_cursor_get(sd, pd->part); 2348 return _efl_ui_layout_part_cursor_get(sd, pd->part);
2349} 2349}
2350 2350
@@ -2352,7 +2352,7 @@ EOLIAN static Eina_Bool
2352_efl_ui_layout_part_efl_ui_cursor_cursor_style_set(Eo *obj, void *_pd EINA_UNUSED, const char *style) 2352_efl_ui_layout_part_efl_ui_cursor_cursor_style_set(Eo *obj, void *_pd EINA_UNUSED, const char *style)
2353{ 2353{
2354 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS); 2354 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS);
2355 Efl_Ui_Layout_Object_Data *sd = efl_data_scope_get(pd->obj, MY_CLASS); 2355 Efl_Ui_Layout_Data *sd = efl_data_scope_get(pd->obj, MY_CLASS);
2356 return _efl_ui_layout_part_cursor_style_set(sd, pd->part, style); 2356 return _efl_ui_layout_part_cursor_style_set(sd, pd->part, style);
2357} 2357}
2358 2358
@@ -2360,7 +2360,7 @@ EOLIAN static const char *
2360_efl_ui_layout_part_efl_ui_cursor_cursor_style_get(const Eo *obj, void *_pd EINA_UNUSED) 2360_efl_ui_layout_part_efl_ui_cursor_cursor_style_get(const Eo *obj, void *_pd EINA_UNUSED)
2361{ 2361{
2362 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS); 2362 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS);
2363 Efl_Ui_Layout_Object_Data *sd = efl_data_scope_get(pd->obj, MY_CLASS); 2363 Efl_Ui_Layout_Data *sd = efl_data_scope_get(pd->obj, MY_CLASS);
2364 return _efl_ui_layout_part_cursor_style_get(sd, pd->part); 2364 return _efl_ui_layout_part_cursor_style_get(sd, pd->part);
2365} 2365}
2366 2366
@@ -2368,7 +2368,7 @@ EOLIAN static Eina_Bool
2368_efl_ui_layout_part_efl_ui_cursor_cursor_theme_search_enabled_set(Eo *obj, void *_pd EINA_UNUSED, Eina_Bool allow) 2368_efl_ui_layout_part_efl_ui_cursor_cursor_theme_search_enabled_set(Eo *obj, void *_pd EINA_UNUSED, Eina_Bool allow)
2369{ 2369{
2370 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS); 2370 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS);
2371 Efl_Ui_Layout_Object_Data *sd = efl_data_scope_get(pd->obj, MY_CLASS); 2371 Efl_Ui_Layout_Data *sd = efl_data_scope_get(pd->obj, MY_CLASS);
2372 return _efl_ui_layout_part_cursor_engine_only_set(sd, pd->part, !allow); 2372 return _efl_ui_layout_part_cursor_engine_only_set(sd, pd->part, !allow);
2373} 2373}
2374 2374
@@ -2376,7 +2376,7 @@ EOLIAN static Eina_Bool
2376_efl_ui_layout_part_efl_ui_cursor_cursor_theme_search_enabled_get(const Eo *obj, void *_pd EINA_UNUSED) 2376_efl_ui_layout_part_efl_ui_cursor_cursor_theme_search_enabled_get(const Eo *obj, void *_pd EINA_UNUSED)
2377{ 2377{
2378 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS); 2378 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS);
2379 Efl_Ui_Layout_Object_Data *sd = efl_data_scope_get(pd->obj, MY_CLASS); 2379 Efl_Ui_Layout_Data *sd = efl_data_scope_get(pd->obj, MY_CLASS);
2380 return !_efl_ui_layout_part_cursor_engine_only_get(sd, pd->part); 2380 return !_efl_ui_layout_part_cursor_engine_only_get(sd, pd->part);
2381} 2381}
2382 2382
@@ -2395,12 +2395,12 @@ _efl_ui_layout_part_efl_ui_cursor_cursor_theme_search_enabled_get(const Eo *obj,
2395 ELM_PART_OVERRIDE_TEXT_MARKUP_GET_FULL(part_typename, typename, ELM_PART_OVERRIDE_INTERNALS_FETCH(CLASS, TYPENAME)) \ 2395 ELM_PART_OVERRIDE_TEXT_MARKUP_GET_FULL(part_typename, typename, ELM_PART_OVERRIDE_INTERNALS_FETCH(CLASS, TYPENAME)) \
2396 ELM_PART_OVERRIDE_TEXT_MARKUP_SET_FULL(part_typename, typename, ELM_PART_OVERRIDE_INTERNALS_FETCH(CLASS, TYPENAME)) \ 2396 ELM_PART_OVERRIDE_TEXT_MARKUP_SET_FULL(part_typename, typename, ELM_PART_OVERRIDE_INTERNALS_FETCH(CLASS, TYPENAME)) \
2397 2397
2398/* Efl.Ui.Layout.Part_Content */ 2398/* Efl.Ui.Layout_Part_Content */
2399CONTENT_FULL(efl_ui_layout_part_content, efl_ui_layout, EFL_UI_LAYOUT_OBJECT, Efl_Ui_Layout_Object_Data) 2399CONTENT_FULL(efl_ui_layout_part_content, efl_ui_layout, EFL_UI_LAYOUT, Efl_Ui_Layout_Data)
2400 2400
2401/* Efl.Ui.Layout.Part_Text */ 2401/* Efl.Ui.Layout_Part_Text */
2402TEXT_FULL(efl_ui_layout_part_text, efl_ui_layout, EFL_UI_LAYOUT_OBJECT, Efl_Ui_Layout_Object_Data) 2402TEXT_FULL(efl_ui_layout_part_text, efl_ui_layout, EFL_UI_LAYOUT, Efl_Ui_Layout_Data)
2403MARKUP_FULL(efl_ui_layout_part_text, efl_ui_layout, EFL_UI_LAYOUT_OBJECT, Efl_Ui_Layout_Object_Data) 2403MARKUP_FULL(efl_ui_layout_part_text, efl_ui_layout, EFL_UI_LAYOUT, Efl_Ui_Layout_Data)
2404 2404
2405EOLIAN static const char * 2405EOLIAN static const char *
2406_efl_ui_layout_part_text_efl_ui_translatable_translatable_text_get(const Eo *obj, void *_pd EINA_UNUSED, const char **domain) 2406_efl_ui_layout_part_text_efl_ui_translatable_translatable_text_get(const Eo *obj, void *_pd EINA_UNUSED, const char **domain)
@@ -2416,10 +2416,10 @@ _efl_ui_layout_part_text_efl_ui_translatable_translatable_text_set(Eo *obj, void
2416 elm_widget_part_translatable_text_set(pd->obj, pd->part, label, domain); 2416 elm_widget_part_translatable_text_set(pd->obj, pd->part, label, domain);
2417} 2417}
2418 2418
2419/* Efl.Ui.Layout.Part_Legacy */ 2419/* Efl.Ui.Layout_Part_Legacy */
2420CONTENT_FULL(efl_ui_layout_part_legacy, efl_ui_layout, EFL_UI_LAYOUT_OBJECT, Efl_Ui_Layout_Object_Data) 2420CONTENT_FULL(efl_ui_layout_part_legacy, efl_ui_layout, EFL_UI_LAYOUT, Efl_Ui_Layout_Data)
2421TEXT_FULL(efl_ui_layout_part_legacy, efl_ui_layout, EFL_UI_LAYOUT_OBJECT, Efl_Ui_Layout_Object_Data) 2421TEXT_FULL(efl_ui_layout_part_legacy, efl_ui_layout, EFL_UI_LAYOUT, Efl_Ui_Layout_Data)
2422MARKUP_FULL(efl_ui_layout_part_legacy, efl_ui_layout, EFL_UI_LAYOUT_OBJECT, Efl_Ui_Layout_Object_Data) 2422MARKUP_FULL(efl_ui_layout_part_legacy, efl_ui_layout, EFL_UI_LAYOUT, Efl_Ui_Layout_Data)
2423 2423
2424EOLIAN static const char * 2424EOLIAN static const char *
2425_efl_ui_layout_part_legacy_efl_ui_translatable_translatable_text_get(const Eo *obj, void *_pd EINA_UNUSED, const char **domain) 2425_efl_ui_layout_part_legacy_efl_ui_translatable_translatable_text_get(const Eo *obj, void *_pd EINA_UNUSED, const char **domain)
@@ -2435,12 +2435,12 @@ _efl_ui_layout_part_legacy_efl_ui_translatable_translatable_text_set(Eo *obj, vo
2435 elm_widget_part_translatable_text_set(pd->obj, pd->part, label, domain); 2435 elm_widget_part_translatable_text_set(pd->obj, pd->part, label, domain);
2436} 2436}
2437 2437
2438/* Efl.Ui.Layout.Part_Bg (common) */ 2438/* Efl.Ui.Layout_Part_Bg (common) */
2439 2439
2440EOLIAN static Efl_Object * 2440EOLIAN static Efl_Object *
2441_efl_ui_layout_part_bg_efl_object_finalize(Eo *obj, void *_pd EINA_UNUSED) 2441_efl_ui_layout_part_bg_efl_object_finalize(Eo *obj, void *_pd EINA_UNUSED)
2442{ 2442{
2443 Efl_Ui_Layout_Object_Data *sd; 2443 Efl_Ui_Layout_Data *sd;
2444 Elm_Part_Data *pd; 2444 Elm_Part_Data *pd;
2445 Eo *bg; 2445 Eo *bg;
2446 2446
@@ -2459,7 +2459,7 @@ _efl_ui_layout_part_bg_efl_object_finalize(Eo *obj, void *_pd EINA_UNUSED)
2459 return obj; 2459 return obj;
2460} 2460}
2461 2461
2462/* Efl.Ui.Layout.Part_Xxx includes */ 2462/* Efl.Ui.Layout_Part_Xxx includes */
2463#include "efl_ui_layout_part.eo.c" 2463#include "efl_ui_layout_part.eo.c"
2464#include "efl_ui_layout_part_content.eo.c" 2464#include "efl_ui_layout_part_content.eo.c"
2465#include "efl_ui_layout_part_bg.eo.c" 2465#include "efl_ui_layout_part_bg.eo.c"
@@ -2478,7 +2478,7 @@ EFL_FUNC_BODY_CONST(elm_layout_content_aliases_get, const Elm_Layout_Part_Alias_
2478ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX) 2478ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
2479ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX) 2479ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
2480 2480
2481#define EFL_UI_LAYOUT_OBJECT_EXTRA_OPS \ 2481#define EFL_UI_LAYOUT_EXTRA_OPS \
2482 EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_layout), \ 2482 EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_layout), \
2483 ELM_PART_CONTENT_DEFAULT_OPS(efl_ui_layout), \ 2483 ELM_PART_CONTENT_DEFAULT_OPS(efl_ui_layout), \
2484 ELM_PART_TEXT_DEFAULT_OPS(efl_ui_layout), \ 2484 ELM_PART_TEXT_DEFAULT_OPS(efl_ui_layout), \
@@ -2487,7 +2487,7 @@ ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
2487 EFL_OBJECT_OP_FUNC(elm_layout_sizing_eval, _elm_layout_sizing_eval), \ 2487 EFL_OBJECT_OP_FUNC(elm_layout_sizing_eval, _elm_layout_sizing_eval), \
2488 EFL_OBJECT_OP_FUNC(efl_dbg_info_get, _efl_ui_layout_efl_object_dbg_info_get) 2488 EFL_OBJECT_OP_FUNC(efl_dbg_info_get, _efl_ui_layout_efl_object_dbg_info_get)
2489 2489
2490#include "efl_ui_layout_object.eo.c" 2490#include "efl_ui_layout.eo.c"
2491 2491
2492#include "efl_ui_layout_legacy.eo.h" 2492#include "efl_ui_layout_legacy.eo.h"
2493 2493
@@ -2702,7 +2702,7 @@ _elm_layout_signal_callback_add_legacy(Eo *obj, Eo *edje, Eina_List **p_edje_sig
2702EAPI void 2702EAPI void
2703elm_layout_signal_callback_add(Eo *obj, const char *emission, const char *source, Edje_Signal_Cb func, void *data) 2703elm_layout_signal_callback_add(Eo *obj, const char *emission, const char *source, Edje_Signal_Cb func, void *data)
2704{ 2704{
2705 Efl_Ui_Layout_Object_Data *sd; 2705 Efl_Ui_Layout_Data *sd;
2706 2706
2707 if (!emission || !source) return; 2707 if (!emission || !source) return;
2708 2708
@@ -2756,7 +2756,7 @@ _elm_layout_signal_callback_del_legacy(Eo *obj EINA_UNUSED, Eo *edje, Eina_List
2756EAPI void * 2756EAPI void *
2757elm_layout_signal_callback_del(Eo *obj, const char *emission, const char *source, Edje_Signal_Cb func) 2757elm_layout_signal_callback_del(Eo *obj, const char *emission, const char *source, Edje_Signal_Cb func)
2758{ 2758{
2759 Efl_Ui_Layout_Object_Data *sd; 2759 Efl_Ui_Layout_Data *sd;
2760 2760
2761 if (!emission || !source) return NULL; 2761 if (!emission || !source) return NULL;
2762 2762
@@ -2788,7 +2788,7 @@ elm_layout_theme_set(Evas_Object *obj, const char *klass, const char *group, con
2788{ 2788{
2789 Efl_Ui_Theme_Apply ta; 2789 Efl_Ui_Theme_Apply ta;
2790 2790
2791 ta = efl_ui_layout_object_theme_set(obj, klass, group, style); 2791 ta = efl_ui_layout_theme_set(obj, klass, group, style);
2792 return (ta != EFL_UI_THEME_APPLY_FAILED); 2792 return (ta != EFL_UI_THEME_APPLY_FAILED);
2793} 2793}
2794 2794
diff --git a/src/lib/elementary/efl_ui_layout_object.eo b/src/lib/elementary/efl_ui_layout.eo
index 1aa121b..510096c 100644
--- a/src/lib/elementary/efl_ui_layout_object.eo
+++ b/src/lib/elementary/efl_ui_layout.eo
@@ -1,6 +1,6 @@
1import efl_ui; 1import efl_ui;
2 2
3class Efl.Ui.Layout.Object (Efl.Ui.Widget, Efl.Part, Efl.Container, Efl.File, 3class Efl.Ui.Layout (Efl.Ui.Widget, Efl.Part, Efl.Container, Efl.File,
4 Efl.Ui.View, Efl.Ui.Model.Connect, Efl.Ui.Factory, 4 Efl.Ui.View, Efl.Ui.Model.Connect, Efl.Ui.Factory,
5 Efl.Layout.Calc, Efl.Layout.Signal, 5 Efl.Layout.Calc, Efl.Layout.Signal,
6 Efl.Layout.Group) 6 Efl.Layout.Group)
@@ -16,7 +16,7 @@ class Efl.Ui.Layout.Object (Efl.Ui.Widget, Efl.Part, Efl.Container, Efl.File,
16 16
17 Widgets that inherit from this class will call this function 17 Widgets that inherit from this class will call this function
18 automatically so it should not be called by applications, unless 18 automatically so it should not be called by applications, unless
19 you are dealing directly with a @Efl.Ui.Layout.Object object. 19 you are dealing directly with a @Efl.Ui.Layout object.
20 ]] 20 ]]
21 set { 21 set {
22 [[Sets the edje group from the elementary theme that will be used 22 [[Sets the edje group from the elementary theme that will be used
diff --git a/src/lib/elementary/efl_ui_layout_factory.c b/src/lib/elementary/efl_ui_layout_factory.c
index 73d1809..43d0a0f 100644
--- a/src/lib/elementary/efl_ui_layout_factory.c
+++ b/src/lib/elementary/efl_ui_layout_factory.c
@@ -92,9 +92,9 @@ _efl_ui_layout_factory_efl_ui_factory_create(Eo *obj EINA_UNUSED, Efl_Ui_Layout_
92 } 92 }
93 else */ 93 else */
94 { 94 {
95 layout = efl_add(EFL_UI_LAYOUT_OBJECT_CLASS, parent, 95 layout = efl_add(EFL_UI_LAYOUT_CLASS, parent,
96 efl_ui_view_model_set(efl_added, model), 96 efl_ui_view_model_set(efl_added, model),
97 efl_ui_layout_object_theme_set(efl_added, pd->klass, pd->group, pd->style)); 97 efl_ui_layout_theme_set(efl_added, pd->klass, pd->group, pd->style));
98 98
99 eina_hash_foreach(pd->connects, _model_connect, layout); 99 eina_hash_foreach(pd->connects, _model_connect, layout);
100 eina_hash_foreach(pd->factory_connects, _factory_model_connect, layout); 100 eina_hash_foreach(pd->factory_connects, _factory_model_connect, layout);
diff --git a/src/lib/elementary/efl_ui_layout_legacy.eo b/src/lib/elementary/efl_ui_layout_legacy.eo
index 383f461..e444e4d 100644
--- a/src/lib/elementary/efl_ui_layout_legacy.eo
+++ b/src/lib/elementary/efl_ui_layout_legacy.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Layout_Legacy (Efl.Ui.Layout.Object, Efl.Ui.Legacy) 1class Efl.Ui.Layout_Legacy (Efl.Ui.Layout, Efl.Ui.Legacy)
2{ 2{
3 [[Elementary layout class]] 3 [[Elementary layout class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/efl_ui_layout_pack.c b/src/lib/elementary/efl_ui_layout_pack.c
index 4cd9915..e01ba66 100644
--- a/src/lib/elementary/efl_ui_layout_pack.c
+++ b/src/lib/elementary/efl_ui_layout_pack.c
@@ -17,15 +17,15 @@
17#include "../evas/canvas/evas_table.eo.h" 17#include "../evas/canvas/evas_table.eo.h"
18 18
19/* layout internals for box & table */ 19/* layout internals for box & table */
20Eina_Bool _efl_ui_layout_box_append(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, Evas_Object *child); 20Eina_Bool _efl_ui_layout_box_append(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Evas_Object *child);
21Eina_Bool _efl_ui_layout_box_prepend(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, Evas_Object *child); 21Eina_Bool _efl_ui_layout_box_prepend(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Evas_Object *child);
22Eina_Bool _efl_ui_layout_box_insert_before(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, Evas_Object *child, const Evas_Object *reference); 22Eina_Bool _efl_ui_layout_box_insert_before(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Evas_Object *child, const Evas_Object *reference);
23Eina_Bool _efl_ui_layout_box_insert_at(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, Evas_Object *child, unsigned int pos); 23Eina_Bool _efl_ui_layout_box_insert_at(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Evas_Object *child, unsigned int pos);
24Evas_Object *_efl_ui_layout_box_remove(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, Evas_Object *child); 24Evas_Object *_efl_ui_layout_box_remove(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Evas_Object *child);
25Eina_Bool _efl_ui_layout_box_remove_all(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, Eina_Bool clear); 25Eina_Bool _efl_ui_layout_box_remove_all(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Eina_Bool clear);
26Eina_Bool _efl_ui_layout_table_pack(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, Evas_Object *child, unsigned short col, unsigned short row, unsigned short colspan, unsigned short rowspan); 26Eina_Bool _efl_ui_layout_table_pack(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Evas_Object *child, unsigned short col, unsigned short row, unsigned short colspan, unsigned short rowspan);
27Evas_Object *_efl_ui_layout_table_unpack(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, Evas_Object *child); 27Evas_Object *_efl_ui_layout_table_unpack(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Evas_Object *child);
28Eina_Bool _efl_ui_layout_table_clear(Eo *obj, Efl_Ui_Layout_Object_Data *sd, const char *part, Eina_Bool clear); 28Eina_Bool _efl_ui_layout_table_clear(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Eina_Bool clear);
29 29
30#define BOX_CLASS EFL_UI_LAYOUT_PART_BOX_CLASS 30#define BOX_CLASS EFL_UI_LAYOUT_PART_BOX_CLASS
31#define TABLE_CLASS EFL_UI_LAYOUT_PART_TABLE_CLASS 31#define TABLE_CLASS EFL_UI_LAYOUT_PART_TABLE_CLASS
@@ -35,14 +35,14 @@ typedef struct _Layout_Part_Data Efl_Ui_Layout_Table_Data;
35 35
36struct _Layout_Part_Data 36struct _Layout_Part_Data
37{ 37{
38 Efl_Ui_Layout_Object *obj; // no ref 38 Efl_Ui_Layout *obj; // no ref
39 Efl_Ui_Layout_Object_Data *sd; // data xref 39 Efl_Ui_Layout_Data *sd; // data xref
40 Eina_Stringshare *part; 40 Eina_Stringshare *part;
41 unsigned char temp; 41 unsigned char temp;
42}; 42};
43 43
44Eo * 44Eo *
45_efl_ui_layout_pack_proxy_get(Efl_Ui_Layout_Object *obj, Edje_Part_Type type, const char *part) 45_efl_ui_layout_pack_proxy_get(Efl_Ui_Layout *obj, Edje_Part_Type type, const char *part)
46{ 46{
47 if (type == EDJE_PART_TYPE_BOX) 47 if (type == EDJE_PART_TYPE_BOX)
48 return efl_add(BOX_CLASS, obj, 48 return efl_add(BOX_CLASS, obj,
@@ -67,7 +67,7 @@ EOLIAN static void
67_efl_ui_layout_part_box_real_part_set(Eo *obj, Efl_Ui_Layout_Box_Data *pd, Eo *layout, const char *part) 67_efl_ui_layout_part_box_real_part_set(Eo *obj, Efl_Ui_Layout_Box_Data *pd, Eo *layout, const char *part)
68{ 68{
69 pd->obj = layout; 69 pd->obj = layout;
70 pd->sd = efl_data_xref(pd->obj, EFL_UI_LAYOUT_OBJECT_CLASS, obj); 70 pd->sd = efl_data_xref(pd->obj, EFL_UI_LAYOUT_CLASS, obj);
71 eina_stringshare_replace(&pd->part, part); 71 eina_stringshare_replace(&pd->part, part);
72 pd->temp = 1; 72 pd->temp = 1;
73} 73}
@@ -225,7 +225,7 @@ EOLIAN static void
225_efl_ui_layout_part_table_real_part_set(Eo *obj, Efl_Ui_Layout_Table_Data *pd, Eo *layout, const char *part) 225_efl_ui_layout_part_table_real_part_set(Eo *obj, Efl_Ui_Layout_Table_Data *pd, Eo *layout, const char *part)
226{ 226{
227 pd->obj = layout; 227 pd->obj = layout;
228 pd->sd = efl_data_xref(pd->obj, EFL_UI_LAYOUT_OBJECT_CLASS, obj); 228 pd->sd = efl_data_xref(pd->obj, EFL_UI_LAYOUT_CLASS, obj);
229 eina_stringshare_replace(&pd->part, part); 229 eina_stringshare_replace(&pd->part, part);
230 pd->temp = 1; 230 pd->temp = 1;
231} 231}
diff --git a/src/lib/elementary/efl_ui_layout_part.eo b/src/lib/elementary/efl_ui_layout_part.eo
index eac6aa5..0a3f84b 100644
--- a/src/lib/elementary/efl_ui_layout_part.eo
+++ b/src/lib/elementary/efl_ui_layout_part.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Layout.Part (Efl.Ui.Widget_Part, Efl.Ui.Cursor) 1class Efl.Ui.Layout_Part (Efl.Ui.Widget_Part, Efl.Ui.Cursor)
2{ 2{
3 [[Elementary layout internal part class]] 3 [[Elementary layout internal part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/efl_ui_layout_part_bg.eo b/src/lib/elementary/efl_ui_layout_part_bg.eo
index 27b79d5..372099e 100644
--- a/src/lib/elementary/efl_ui_layout_part_bg.eo
+++ b/src/lib/elementary/efl_ui_layout_part_bg.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Layout.Part_Bg (Efl.Ui.Widget_Part_Bg) 1class Efl.Ui.Layout_Part_Bg (Efl.Ui.Widget_Part_Bg)
2{ 2{
3 [[Elementary layout internal part background class]] 3 [[Elementary layout internal part background class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/efl_ui_layout_part_box.eo b/src/lib/elementary/efl_ui_layout_part_box.eo
index 6526c56..575749a 100644
--- a/src/lib/elementary/efl_ui_layout_part_box.eo
+++ b/src/lib/elementary/efl_ui_layout_part_box.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Layout.Part_Box (Efl.Object, Efl.Pack_Linear, 1class Efl.Ui.Layout_Part_Box (Efl.Object, Efl.Pack_Linear,
2 Efl.Ui.Direction) 2 Efl.Ui.Direction)
3{ 3{
4 [[Represents a Box created as part of a layout. 4 [[Represents a Box created as part of a layout.
diff --git a/src/lib/elementary/efl_ui_layout_part_content.eo b/src/lib/elementary/efl_ui_layout_part_content.eo
index c1884f8..20284f2 100644
--- a/src/lib/elementary/efl_ui_layout_part_content.eo
+++ b/src/lib/elementary/efl_ui_layout_part_content.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Layout.Part_Content (Efl.Ui.Layout.Part, Efl.Content) 1class Efl.Ui.Layout_Part_Content (Efl.Ui.Layout_Part, Efl.Content)
2{ 2{
3 [[Elementary layout internal part class]] 3 [[Elementary layout internal part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/efl_ui_layout_part_legacy.eo b/src/lib/elementary/efl_ui_layout_part_legacy.eo
index 8c7e2d3..5bb8004 100644
--- a/src/lib/elementary/efl_ui_layout_part_legacy.eo
+++ b/src/lib/elementary/efl_ui_layout_part_legacy.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Layout.Part_Legacy (Efl.Ui.Layout.Part, Efl.Content, Efl.Text, 1class Efl.Ui.Layout_Part_Legacy (Efl.Ui.Layout_Part, Efl.Content, Efl.Text,
2 Efl.Text_Markup, Efl.Ui.Translatable) 2 Efl.Text_Markup, Efl.Ui.Translatable)
3{ 3{
4 [[Elementary layout internal part class]] 4 [[Elementary layout internal part class]]
diff --git a/src/lib/elementary/efl_ui_layout_part_table.eo b/src/lib/elementary/efl_ui_layout_part_table.eo
index 6f75c49..660afa4 100644
--- a/src/lib/elementary/efl_ui_layout_part_table.eo
+++ b/src/lib/elementary/efl_ui_layout_part_table.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Layout.Part_Table (Efl.Object, Efl.Pack_Table) 1class Efl.Ui.Layout_Part_Table (Efl.Object, Efl.Pack_Table)
2{ 2{
3 [[Represents a Table created as part of a layout. 3 [[Represents a Table created as part of a layout.
4 4
diff --git a/src/lib/elementary/efl_ui_layout_part_text.eo b/src/lib/elementary/efl_ui_layout_part_text.eo
index 82347b9..abe9fce 100644
--- a/src/lib/elementary/efl_ui_layout_part_text.eo
+++ b/src/lib/elementary/efl_ui_layout_part_text.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Layout.Part_Text (Efl.Ui.Layout.Part, Efl.Text, Efl.Text_Markup, 1class Efl.Ui.Layout_Part_Text (Efl.Ui.Layout_Part, Efl.Text, Efl.Text_Markup,
2 Efl.Ui.Translatable) 2 Efl.Ui.Translatable)
3{ 3{
4 [[Elementary layout internal part class]] 4 [[Elementary layout internal part class]]
diff --git a/src/lib/elementary/efl_ui_list.c b/src/lib/elementary/efl_ui_list.c
index 479e051..8a9a299 100644
--- a/src/lib/elementary/efl_ui_list.c
+++ b/src/lib/elementary/efl_ui_list.c
@@ -427,7 +427,7 @@ _efl_ui_list_efl_object_finalize(Eo *obj,
427 427
428 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL); 428 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL);
429 429
430 Efl_Ui_Theme_Apply theme_apply = efl_ui_layout_object_theme_set(obj, "list", "base", efl_ui_widget_style_get(obj)); 430 Efl_Ui_Theme_Apply theme_apply = efl_ui_layout_theme_set(obj, "list", "base", efl_ui_widget_style_get(obj));
431 if (theme_apply == EFL_UI_THEME_APPLY_FAILED) 431 if (theme_apply == EFL_UI_THEME_APPLY_FAILED)
432 CRI("list(%p) failed to set theme [efl/list:%s]!", obj, efl_ui_widget_style_get(obj) ?: "NULL"); 432 CRI("list(%p) failed to set theme [efl/list:%s]!", obj, efl_ui_widget_style_get(obj) ?: "NULL");
433 433
diff --git a/src/lib/elementary/efl_ui_list.eo b/src/lib/elementary/efl_ui_list.eo
index b97e5b5..f6fb19c 100644
--- a/src/lib/elementary/efl_ui_list.eo
+++ b/src/lib/elementary/efl_ui_list.eo
@@ -1,6 +1,6 @@
1import efl_ui_list_item; 1import efl_ui_list_item;
2 2
3class Efl.Ui.List (Efl.Ui.Layout.Object, 3class Efl.Ui.List (Efl.Ui.Layout,
4 Efl.Ui.Scrollable_Interactive, 4 Efl.Ui.Scrollable_Interactive,
5 Efl.Ui.Scrollbar, 5 Efl.Ui.Scrollbar,
6 Efl.Pack_Linear, Efl.Pack_Layout, 6 Efl.Pack_Linear, Efl.Pack_Layout,
diff --git a/src/lib/elementary/efl_ui_list_default_item.c b/src/lib/elementary/efl_ui_list_default_item.c
index 19bfed4..fc41087 100644
--- a/src/lib/elementary/efl_ui_list_default_item.c
+++ b/src/lib/elementary/efl_ui_list_default_item.c
@@ -23,7 +23,7 @@ _efl_ui_list_default_item_efl_object_finalize(Eo *obj, void *pd EINA_UNUSED)
23 Eo *eo; 23 Eo *eo;
24 eo = efl_finalize(efl_super(obj, MY_CLASS)); 24 eo = efl_finalize(efl_super(obj, MY_CLASS));
25 ELM_WIDGET_DATA_GET_OR_RETURN(eo, wd, eo); 25 ELM_WIDGET_DATA_GET_OR_RETURN(eo, wd, eo);
26 Efl_Ui_Theme_Apply theme_apply = efl_ui_layout_object_theme_set(obj, "list_item", NULL, NULL); 26 Efl_Ui_Theme_Apply theme_apply = efl_ui_layout_theme_set(obj, "list_item", NULL, NULL);
27 27
28 if (theme_apply == EFL_UI_THEME_APPLY_FAILED) 28 if (theme_apply == EFL_UI_THEME_APPLY_FAILED)
29 CRI("Default Item(%p) failed to set theme [efl/list_item]!", eo); 29 CRI("Default Item(%p) failed to set theme [efl/list_item]!", eo);
diff --git a/src/lib/elementary/efl_ui_list_default_item_part_end.eo b/src/lib/elementary/efl_ui_list_default_item_part_end.eo
index 7388c9f..d149213 100644
--- a/src/lib/elementary/efl_ui_list_default_item_part_end.eo
+++ b/src/lib/elementary/efl_ui_list_default_item_part_end.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.List_Default_Item_Part_End (Efl.Ui.Layout.Part, Efl.Content) 1class Efl.Ui.List_Default_Item_Part_End (Efl.Ui.Layout_Part, Efl.Content)
2{ 2{
3 [[List Default Item internal content of end part class]] 3 [[List Default Item internal content of end part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/efl_ui_list_default_item_part_icon.eo b/src/lib/elementary/efl_ui_list_default_item_part_icon.eo
index faed96d..b3359eb 100644
--- a/src/lib/elementary/efl_ui_list_default_item_part_icon.eo
+++ b/src/lib/elementary/efl_ui_list_default_item_part_icon.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.List_Default_Item_Part_Icon (Efl.Ui.Layout.Part, Efl.Content) 1class Efl.Ui.List_Default_Item_Part_Icon (Efl.Ui.Layout_Part, Efl.Content)
2{ 2{
3 [[List Default Item internal content of icon part class]] 3 [[List Default Item internal content of icon part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/efl_ui_list_empty_item.c b/src/lib/elementary/efl_ui_list_empty_item.c
index 066abdd..8435489 100644
--- a/src/lib/elementary/efl_ui_list_empty_item.c
+++ b/src/lib/elementary/efl_ui_list_empty_item.c
@@ -21,7 +21,7 @@ _efl_ui_list_empty_item_efl_object_finalize(Eo *obj, void *pd EINA_UNUSED)
21 Eo *eo; 21 Eo *eo;
22 eo = efl_finalize(efl_super(obj, MY_CLASS)); 22 eo = efl_finalize(efl_super(obj, MY_CLASS));
23 ELM_WIDGET_DATA_GET_OR_RETURN(eo, wd, eo); 23 ELM_WIDGET_DATA_GET_OR_RETURN(eo, wd, eo);
24 Efl_Ui_Theme_Apply theme_apply = efl_ui_layout_object_theme_set(obj, "list_item", NULL, "empty"); 24 Efl_Ui_Theme_Apply theme_apply = efl_ui_layout_theme_set(obj, "list_item", NULL, "empty");
25 25
26 if (theme_apply == EFL_UI_THEME_APPLY_FAILED) 26 if (theme_apply == EFL_UI_THEME_APPLY_FAILED)
27 CRI("Empty Item(%p) failed to set theme [efl/list_item:empty]!", eo); 27 CRI("Empty Item(%p) failed to set theme [efl/list_item:empty]!", eo);
diff --git a/src/lib/elementary/efl_ui_list_view.eo b/src/lib/elementary/efl_ui_list_view.eo
index 07be70b..8b967a2 100644
--- a/src/lib/elementary/efl_ui_list_view.eo
+++ b/src/lib/elementary/efl_ui_list_view.eo
@@ -2,11 +2,11 @@ import elm_general;
2 2
3struct Efl.Ui.List_View_Item_Event 3struct Efl.Ui.List_View_Item_Event
4{ 4{
5 layout: Efl.Ui.Layout.Object; 5 layout: Efl.Ui.Layout;
6 child: Efl.Model; 6 child: Efl.Model;
7 index: int; 7 index: int;
8} 8}
9class Efl.Ui.List_View (Efl.Ui.Layout.Object, Efl.Ui.View, Efl.Ui.Scrollable_Interactive, Efl.Ui.Scrollbar, 9class Efl.Ui.List_View (Efl.Ui.Layout, Efl.Ui.View, Efl.Ui.Scrollable_Interactive, Efl.Ui.Scrollbar,
10 Efl.Access.Widget.Action, Efl.Access.Selection, Efl.Ui.Focus.Composition, Efl.Ui.Focus.Manager_Sub, 10 Efl.Access.Widget.Action, Efl.Access.Selection, Efl.Ui.Focus.Composition, Efl.Ui.Focus.Manager_Sub,
11 Efl.Ui.Clickable, Efl.Ui.Selectable, Efl.Ui.List_View_Model, Efl.Ui.Widget_Focus_Manager) 11 Efl.Ui.Clickable, Efl.Ui.Selectable, Efl.Ui.List_View_Model, Efl.Ui.Widget_Focus_Manager)
12{ 12{
diff --git a/src/lib/elementary/efl_ui_list_view_types.eot b/src/lib/elementary/efl_ui_list_view_types.eot
index fe7d03e..f33bbf5 100644
--- a/src/lib/elementary/efl_ui_list_view_types.eot
+++ b/src/lib/elementary/efl_ui_list_view_types.eot
@@ -1,5 +1,5 @@
1struct Efl.Ui.List_View_Layout_Item { 1struct Efl.Ui.List_View_Layout_Item {
2 layout: Efl.Ui.Layout.Object; 2 layout: Efl.Ui.Layout;
3 children: Efl.Model; 3 children: Efl.Model;
4 index_offset: int; 4 index_offset: int;
5 tree_node: void_ptr; 5 tree_node: void_ptr;
diff --git a/src/lib/elementary/efl_ui_navigation_bar.eo b/src/lib/elementary/efl_ui_navigation_bar.eo
index ec43bea..f718bc8 100644
--- a/src/lib/elementary/efl_ui_navigation_bar.eo
+++ b/src/lib/elementary/efl_ui_navigation_bar.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Navigation_Bar (Efl.Ui.Layout.Object, Efl.Content, Efl.Text, Efl.Ui.Translatable) 1class Efl.Ui.Navigation_Bar (Efl.Ui.Layout, Efl.Content, Efl.Text, Efl.Ui.Translatable)
2{ 2{
3 [[Navigation_Bar widget. 3 [[Navigation_Bar widget.
4 4
diff --git a/src/lib/elementary/efl_ui_navigation_bar_part.eo b/src/lib/elementary/efl_ui_navigation_bar_part.eo
index 3f14eb3..30f677f 100644
--- a/src/lib/elementary/efl_ui_navigation_bar_part.eo
+++ b/src/lib/elementary/efl_ui_navigation_bar_part.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Navigation_Bar_Part (Efl.Ui.Layout.Part_Content) 1class Efl.Ui.Navigation_Bar_Part (Efl.Ui.Layout_Part_Content)
2{ 2{
3 [[Efl UI Navigation_Bar internal part class]] 3 [[Efl UI Navigation_Bar internal part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/efl_ui_navigation_bar_part_back_button.eo b/src/lib/elementary/efl_ui_navigation_bar_part_back_button.eo
index fb342ab..21ebddb 100644
--- a/src/lib/elementary/efl_ui_navigation_bar_part_back_button.eo
+++ b/src/lib/elementary/efl_ui_navigation_bar_part_back_button.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Navigation_Bar_Part_Back_Button (Efl.Ui.Layout.Part, Efl.Ui.Clickable, Efl.Gfx.Entity, Efl.Text, Efl.Content) 1class Efl.Ui.Navigation_Bar_Part_Back_Button (Efl.Ui.Layout_Part, Efl.Ui.Clickable, Efl.Gfx.Entity, Efl.Text, Efl.Content)
2{ 2{
3 [[Efl Ui Navigation_Bar internal part back button class]] 3 [[Efl Ui Navigation_Bar internal part back button class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/efl_ui_navigation_layout.c b/src/lib/elementary/efl_ui_navigation_layout.c
index e00dc31..843dcbb 100644
--- a/src/lib/elementary/efl_ui_navigation_layout.c
+++ b/src/lib/elementary/efl_ui_navigation_layout.c
@@ -13,15 +13,15 @@
13#define MY_CLASS_NAME "Efl.Ui.Navigation_Layout" 13#define MY_CLASS_NAME "Efl.Ui.Navigation_Layout"
14 14
15EOLIAN static void 15EOLIAN static void
16_efl_ui_navigation_layout_bar_set(Eo *obj, Efl_Ui_Navigation_Layout_Data *pd, Efl_Ui_Layout_Object *bar) 16_efl_ui_navigation_layout_bar_set(Eo *obj, Efl_Ui_Navigation_Layout_Data *pd, Efl_Ui_Layout *bar)
17{ 17{
18 EINA_SAFETY_ON_FALSE_RETURN(efl_isa(bar, EFL_UI_LAYOUT_OBJECT_CLASS)); 18 EINA_SAFETY_ON_FALSE_RETURN(efl_isa(bar, EFL_UI_LAYOUT_CLASS));
19 19
20 efl_content_set(efl_part(obj, "efl.bar"), bar); 20 efl_content_set(efl_part(obj, "efl.bar"), bar);
21 pd->bar = bar; 21 pd->bar = bar;
22} 22}
23 23
24EOLIAN static Efl_Ui_Layout_Object * 24EOLIAN static Efl_Ui_Layout *
25_efl_ui_navigation_layout_bar_get(const Eo *obj EINA_UNUSED, Efl_Ui_Navigation_Layout_Data *pd) 25_efl_ui_navigation_layout_bar_get(const Eo *obj EINA_UNUSED, Efl_Ui_Navigation_Layout_Data *pd)
26{ 26{
27 return pd->bar; 27 return pd->bar;
diff --git a/src/lib/elementary/efl_ui_navigation_layout.eo b/src/lib/elementary/efl_ui_navigation_layout.eo
index fc26479..846fbf6 100644
--- a/src/lib/elementary/efl_ui_navigation_layout.eo
+++ b/src/lib/elementary/efl_ui_navigation_layout.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Navigation_Layout (Efl.Ui.Layout.Object, Efl.Content) 1class Efl.Ui.Navigation_Layout (Efl.Ui.Layout, Efl.Content)
2{ 2{
3 [[Navigation_Layout widget. 3 [[Navigation_Layout widget.
4 4
@@ -16,7 +16,7 @@ class Efl.Ui.Navigation_Layout (Efl.Ui.Layout.Object, Efl.Content)
16 get { 16 get {
17 } 17 }
18 values { 18 values {
19 value: Efl.Ui.Layout.Object; 19 value: Efl.Ui.Layout;
20 [[The bar object located at the top area of the Navigation Layout. 20 [[The bar object located at the top area of the Navigation Layout.
21 ]] 21 ]]
22 } 22 }
diff --git a/src/lib/elementary/efl_ui_navigation_layout_private.h b/src/lib/elementary/efl_ui_navigation_layout_private.h
index d805961..47d3e44 100644
--- a/src/lib/elementary/efl_ui_navigation_layout_private.h
+++ b/src/lib/elementary/efl_ui_navigation_layout_private.h
@@ -4,7 +4,7 @@
4typedef struct _Efl_Ui_Navigation_Layout_Data Efl_Ui_Navigation_Layout_Data; 4typedef struct _Efl_Ui_Navigation_Layout_Data Efl_Ui_Navigation_Layout_Data;
5struct _Efl_Ui_Navigation_Layout_Data 5struct _Efl_Ui_Navigation_Layout_Data
6{ 6{
7 Efl_Ui_Layout_Object *bar; 7 Efl_Ui_Layout *bar;
8}; 8};
9 9
10#define EFL_UI_NAVIGATION_LAYOUT_DATA_GET_OR_RETURN(o, ptr, ...) \ 10#define EFL_UI_NAVIGATION_LAYOUT_DATA_GET_OR_RETURN(o, ptr, ...) \
diff --git a/src/lib/elementary/efl_ui_pager.eo b/src/lib/elementary/efl_ui_pager.eo
index 6f22a0f..2f67cc7 100644
--- a/src/lib/elementary/efl_ui_pager.eo
+++ b/src/lib/elementary/efl_ui_pager.eo
@@ -5,7 +5,7 @@ enum Efl.Ui.Pager_Loop
5 enabled 5 enabled
6} 6}
7 7
8class Efl.Ui.Pager (Efl.Ui.Layout.Object, Efl.Pack_Linear) 8class Efl.Ui.Pager (Efl.Ui.Layout, Efl.Pack_Linear)
9{ 9{
10 [[Pager widget 10 [[Pager widget
11 11
diff --git a/src/lib/elementary/efl_ui_panes.eo b/src/lib/elementary/efl_ui_panes.eo
index 73abf1a..62594f3 100644
--- a/src/lib/elementary/efl_ui_panes.eo
+++ b/src/lib/elementary/efl_ui_panes.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Panes (Efl.Ui.Layout.Object, Efl.Ui.Direction, 1class Efl.Ui.Panes (Efl.Ui.Layout, Efl.Ui.Direction,
2 Efl.Ui.Clickable) 2 Efl.Ui.Clickable)
3{ 3{
4 [[Elementary panes class]] 4 [[Elementary panes class]]
diff --git a/src/lib/elementary/efl_ui_panes_part.eo b/src/lib/elementary/efl_ui_panes_part.eo
index b6a2138..f7b8001 100644
--- a/src/lib/elementary/efl_ui_panes_part.eo
+++ b/src/lib/elementary/efl_ui_panes_part.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Panes_Part (Efl.Ui.Layout.Part_Content) 1class Efl.Ui.Panes_Part (Efl.Ui.Layout_Part_Content)
2{ 2{
3 [[Elementary Panes internal part class]] 3 [[Elementary Panes internal part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/efl_ui_popup.eo b/src/lib/elementary/efl_ui_popup.eo
index 5e74441..16d8105 100644
--- a/src/lib/elementary/efl_ui_popup.eo
+++ b/src/lib/elementary/efl_ui_popup.eo
@@ -8,7 +8,7 @@ enum Efl.Ui.Popup_Align {
8 bottom [[Popup aligned to bottom]] 8 bottom [[Popup aligned to bottom]]
9} 9}
10 10
11class Efl.Ui.Popup(Efl.Ui.Layout.Object, Efl.Content) 11class Efl.Ui.Popup(Efl.Ui.Layout, Efl.Content)
12{ 12{
13 [[EFL UI popup class]] 13 [[EFL UI popup class]]
14 methods { 14 methods {
diff --git a/src/lib/elementary/efl_ui_popup_alert.c b/src/lib/elementary/efl_ui_popup_alert.c
index d0f35d1..9a0efae 100644
--- a/src/lib/elementary/efl_ui_popup_alert.c
+++ b/src/lib/elementary/efl_ui_popup_alert.c
@@ -143,7 +143,7 @@ _efl_ui_popup_alert_button_set(Eo *obj, Efl_Ui_Popup_Alert_Data *pd, Efl_Ui_Popu
143 } 143 }
144 else 144 else
145 { 145 {
146 cur_content = efl_add(EFL_UI_LAYOUT_OBJECT_CLASS, obj, 146 cur_content = efl_add(EFL_UI_LAYOUT_CLASS, obj,
147 efl_content_set(efl_part(obj, "efl.buttons"), efl_added)); 147 efl_content_set(efl_part(obj, "efl.buttons"), efl_added));
148 } 148 }
149 149
diff --git a/src/lib/elementary/efl_ui_popup_alert_part.eo b/src/lib/elementary/efl_ui_popup_alert_part.eo
index 1ca02b9..a58abd8 100644
--- a/src/lib/elementary/efl_ui_popup_alert_part.eo
+++ b/src/lib/elementary/efl_ui_popup_alert_part.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Popup_Alert_Part (Efl.Ui.Layout.Part_Text) 1class Efl.Ui.Popup_Alert_Part (Efl.Ui.Layout_Part_Text)
2{ 2{
3 [[Efl UI Popup Alert internal part class]] 3 [[Efl UI Popup Alert internal part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/efl_ui_popup_alert_scroll_part.eo b/src/lib/elementary/efl_ui_popup_alert_scroll_part.eo
index f41ac3b..0f38208 100644
--- a/src/lib/elementary/efl_ui_popup_alert_scroll_part.eo
+++ b/src/lib/elementary/efl_ui_popup_alert_scroll_part.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Popup_Alert_Scroll_Part (Efl.Ui.Layout.Part, Efl.Content, Efl.Text) 1class Efl.Ui.Popup_Alert_Scroll_Part (Efl.Ui.Layout_Part, Efl.Content, Efl.Text)
2{ 2{
3 [[Efl UI Popup Alert Scroll internal part class]] 3 [[Efl UI Popup Alert Scroll internal part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/efl_ui_popup_alert_text_part.eo b/src/lib/elementary/efl_ui_popup_alert_text_part.eo
index fce0a7b..dcd20de 100644
--- a/src/lib/elementary/efl_ui_popup_alert_text_part.eo
+++ b/src/lib/elementary/efl_ui_popup_alert_text_part.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Popup_Alert_Text_Part (Efl.Ui.Layout.Part, Efl.Content, Efl.Text) 1class Efl.Ui.Popup_Alert_Text_Part (Efl.Ui.Layout_Part, Efl.Content, Efl.Text)
2{ 2{
3 [[Efl UI Popup Alert Text internal part class]] 3 [[Efl UI Popup Alert Text internal part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/efl_ui_popup_part_backwall.eo b/src/lib/elementary/efl_ui_popup_part_backwall.eo
index 94974d0..164bf01 100644
--- a/src/lib/elementary/efl_ui_popup_part_backwall.eo
+++ b/src/lib/elementary/efl_ui_popup_part_backwall.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Popup_Part_Backwall (Efl.Ui.Layout.Part, Efl.File) 1class Efl.Ui.Popup_Part_Backwall (Efl.Ui.Layout_Part, Efl.File)
2{ 2{
3 [[Efl UI Popup internal part backwall class]] 3 [[Efl UI Popup internal part backwall class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/efl_ui_progressbar.eo b/src/lib/elementary/efl_ui_progressbar.eo
index 86592ec..dc296e2 100644
--- a/src/lib/elementary/efl_ui_progressbar.eo
+++ b/src/lib/elementary/efl_ui_progressbar.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Progressbar (Efl.Ui.Layout.Object, Efl.Ui.Range, Efl.Ui.Format, 1class Efl.Ui.Progressbar (Efl.Ui.Layout, Efl.Ui.Range, Efl.Ui.Format,
2 Efl.Ui.Direction, Efl.Access.Value, Efl.Ui.Translatable, 2 Efl.Ui.Direction, Efl.Access.Value, Efl.Ui.Translatable,
3 Efl.Text, Efl.Content, Efl.Text_Markup) 3 Efl.Text, Efl.Content, Efl.Text_Markup)
4{ 4{
diff --git a/src/lib/elementary/efl_ui_progressbar_legacy_part.eo b/src/lib/elementary/efl_ui_progressbar_legacy_part.eo
index 3829808..faffc05 100644
--- a/src/lib/elementary/efl_ui_progressbar_legacy_part.eo
+++ b/src/lib/elementary/efl_ui_progressbar_legacy_part.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Progressbar_Legacy_Part (Efl.Ui.Layout.Part_Content) 1class Efl.Ui.Progressbar_Legacy_Part (Efl.Ui.Layout_Part_Content)
2{ 2{
3 [[Elementary progressbar internal part class]] 3 [[Elementary progressbar internal part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/efl_ui_progressbar_part.eo b/src/lib/elementary/efl_ui_progressbar_part.eo
index c98152a..1b68701 100644
--- a/src/lib/elementary/efl_ui_progressbar_part.eo
+++ b/src/lib/elementary/efl_ui_progressbar_part.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Progressbar_Part (Efl.Ui.Layout.Part, Efl.Ui.Range) 1class Efl.Ui.Progressbar_Part (Efl.Ui.Layout_Part, Efl.Ui.Range)
2{ 2{
3 [[Elementary progressbar internal part class]] 3 [[Elementary progressbar internal part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/efl_ui_radio_legacy_part.eo b/src/lib/elementary/efl_ui_radio_legacy_part.eo
index 666d3c2..ceca646 100644
--- a/src/lib/elementary/efl_ui_radio_legacy_part.eo
+++ b/src/lib/elementary/efl_ui_radio_legacy_part.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Radio_Legacy_Part (Efl.Ui.Layout.Part_Content) 1class Efl.Ui.Radio_Legacy_Part (Efl.Ui.Layout_Part_Content)
2{ 2{
3 [[Elementary radio internal part class]] 3 [[Elementary radio internal part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/efl_ui_scroller.c b/src/lib/elementary/efl_ui_scroller.c
index 6f42bbb..6f74aad 100644
--- a/src/lib/elementary/efl_ui_scroller.c
+++ b/src/lib/elementary/efl_ui_scroller.c
@@ -402,7 +402,7 @@ _efl_ui_scroller_efl_object_finalize(Eo *obj,
402 402
403 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL); 403 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL);
404 404
405 efl_ui_layout_object_theme_set(obj, "scroller", "base", efl_ui_widget_style_get(obj)); 405 efl_ui_layout_theme_set(obj, "scroller", "base", efl_ui_widget_style_get(obj));
406 406
407 sd->smanager = efl_add(EFL_UI_SCROLL_MANAGER_CLASS, obj); 407 sd->smanager = efl_add(EFL_UI_SCROLL_MANAGER_CLASS, obj);
408 efl_ui_mirrored_set(sd->smanager, efl_ui_mirrored_get(obj)); 408 efl_ui_mirrored_set(sd->smanager, efl_ui_mirrored_get(obj));
diff --git a/src/lib/elementary/efl_ui_scroller.eo b/src/lib/elementary/efl_ui_scroller.eo
index e976516..8444294 100644
--- a/src/lib/elementary/efl_ui_scroller.eo
+++ b/src/lib/elementary/efl_ui_scroller.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Scroller (Efl.Ui.Layout.Object, 1class Efl.Ui.Scroller (Efl.Ui.Layout,
2 Efl.Ui.Scrollable_Interactive, 2 Efl.Ui.Scrollable_Interactive,
3 Efl.Ui.Scrollbar, 3 Efl.Ui.Scrollbar,
4 Efl.Content) 4 Efl.Content)
diff --git a/src/lib/elementary/efl_ui_slider.eo b/src/lib/elementary/efl_ui_slider.eo
index 0fe181a..0fa7ad5 100644
--- a/src/lib/elementary/efl_ui_slider.eo
+++ b/src/lib/elementary/efl_ui_slider.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Slider (Efl.Ui.Layout.Object, Efl.Ui.Range, Efl.Ui.Direction, 1class Efl.Ui.Slider (Efl.Ui.Layout, Efl.Ui.Range, Efl.Ui.Direction,
2 Efl.Access.Value, 2 Efl.Access.Value,
3 Efl.Access.Widget.Action, 3 Efl.Access.Widget.Action,
4 Efl.Content) 4 Efl.Content)
diff --git a/src/lib/elementary/efl_ui_spin.eo b/src/lib/elementary/efl_ui_spin.eo
index 55996b5..7bb4fa5 100644
--- a/src/lib/elementary/efl_ui_spin.eo
+++ b/src/lib/elementary/efl_ui_spin.eo
@@ -5,7 +5,7 @@ struct Efl.Ui.Spin_Special_Value
5 label: string; [[String to replace]] 5 label: string; [[String to replace]]
6} 6}
7 7
8class Efl.Ui.Spin (Efl.Ui.Layout.Object, Efl.Ui.Range, Efl.Ui.Format, 8class Efl.Ui.Spin (Efl.Ui.Layout, Efl.Ui.Range, Efl.Ui.Format,
9 Efl.Access.Value, Efl.Access.Widget.Action) 9 Efl.Access.Value, Efl.Access.Widget.Action)
10{ 10{
11 [[A Spin. 11 [[A Spin.
diff --git a/src/lib/elementary/efl_ui_stack.eo b/src/lib/elementary/efl_ui_stack.eo
index 65f8156..86f4b84 100644
--- a/src/lib/elementary/efl_ui_stack.eo
+++ b/src/lib/elementary/efl_ui_stack.eo
@@ -18,7 +18,7 @@ struct Efl.Ui.Stack_Event_Deactivated {
18 content: Efl.Canvas.Object; [[Deactivated content.]] 18 content: Efl.Canvas.Object; [[Deactivated content.]]
19} 19}
20 20
21class Efl.Ui.Stack (Efl.Ui.Layout.Object) 21class Efl.Ui.Stack (Efl.Ui.Layout)
22{ 22{
23 [[Stack widget. 23 [[Stack widget.
24 24
diff --git a/src/lib/elementary/efl_ui_tab_bar.c b/src/lib/elementary/efl_ui_tab_bar.c
index eb328e3..37578a7 100644
--- a/src/lib/elementary/efl_ui_tab_bar.c
+++ b/src/lib/elementary/efl_ui_tab_bar.c
@@ -221,7 +221,7 @@ _tab_add(Eo *obj, const char *label, const char *icon)
221 ti->tab = NULL; 221 ti->tab = NULL;
222 ti->label = eina_stringshare_add(label); 222 ti->label = eina_stringshare_add(label);
223 223
224 tab = efl_add(EFL_UI_LAYOUT_OBJECT_CLASS, obj); 224 tab = efl_add(EFL_UI_LAYOUT_CLASS, obj);
225 225
226 icon_obj = elm_icon_add(tab); 226 icon_obj = elm_icon_add(tab);
227 227
diff --git a/src/lib/elementary/efl_ui_tab_bar.eo b/src/lib/elementary/efl_ui_tab_bar.eo
index 0f1c731..95c42c4 100644
--- a/src/lib/elementary/efl_ui_tab_bar.eo
+++ b/src/lib/elementary/efl_ui_tab_bar.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Tab_Bar (Efl.Ui.Layout.Object, Efl.Ui.Clickable) 1class Efl.Ui.Tab_Bar (Efl.Ui.Layout, Efl.Ui.Clickable)
2{ 2{
3 [[Tab Bar class]] 3 [[Tab Bar class]]
4 methods { 4 methods {
diff --git a/src/lib/elementary/efl_ui_tab_page.eo b/src/lib/elementary/efl_ui_tab_page.eo
index 5238e8e..f321d47 100644
--- a/src/lib/elementary/efl_ui_tab_page.eo
+++ b/src/lib/elementary/efl_ui_tab_page.eo
@@ -8,7 +8,7 @@ struct Efl.Ui.Tab_Page_Tab_Changed_Event {
8 changed_info: Efl.Ui.Tab_Page_Tab_Changed; 8 changed_info: Efl.Ui.Tab_Page_Tab_Changed;
9} 9}
10 10
11class Efl.Ui.Tab_Page (Efl.Ui.Layout.Object, Efl.Content) 11class Efl.Ui.Tab_Page (Efl.Ui.Layout, Efl.Content)
12{ 12{
13 [[Tab Page class]] 13 [[Tab Page class]]
14 methods { 14 methods {
diff --git a/src/lib/elementary/efl_ui_tab_page_part_tab.eo b/src/lib/elementary/efl_ui_tab_page_part_tab.eo
index 8c2ce57..74d3449 100644
--- a/src/lib/elementary/efl_ui_tab_page_part_tab.eo
+++ b/src/lib/elementary/efl_ui_tab_page_part_tab.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Tab_Page_Part_Tab (Efl.Ui.Layout.Part, Efl.Text) 1class Efl.Ui.Tab_Page_Part_Tab (Efl.Ui.Layout_Part, Efl.Text)
2{ 2{
3 [[Tab_Page internal part class]] 3 [[Tab_Page internal part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/efl_ui_tags.c b/src/lib/elementary/efl_ui_tags.c
index c473b12..9a7a28f 100644
--- a/src/lib/elementary/efl_ui_tags.c
+++ b/src/lib/elementary/efl_ui_tags.c
@@ -401,7 +401,7 @@ _item_new(Efl_Ui_Tags_Data *sd,
401 401
402 if (!str) return NULL; 402 if (!str) return NULL;
403 403
404 layout = efl_add(EFL_UI_LAYOUT_OBJECT_CLASS, obj); 404 layout = efl_add(EFL_UI_LAYOUT_CLASS, obj);
405 405
406 if (!elm_widget_element_update(obj, layout, PART_NAME_BUTTON)) 406 if (!elm_widget_element_update(obj, layout, PART_NAME_BUTTON))
407 CRI("Failed to set layout!"); 407 CRI("Failed to set layout!");
diff --git a/src/lib/elementary/efl_ui_tags.eo b/src/lib/elementary/efl_ui_tags.eo
index 637b9f8..256271a 100644
--- a/src/lib/elementary/efl_ui_tags.eo
+++ b/src/lib/elementary/efl_ui_tags.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Tags (Efl.Ui.Layout.Object, Efl.Text, Efl.Ui.Format) 1class Efl.Ui.Tags (Efl.Ui.Layout, Efl.Text, Efl.Ui.Format)
2{ 2{
3 [[Elementary Tags class]] 3 [[Elementary Tags class]]
4 methods { 4 methods {
diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c
index 9825e98..711454d 100644
--- a/src/lib/elementary/efl_ui_text.c
+++ b/src/lib/elementary/efl_ui_text.c
@@ -797,7 +797,7 @@ _efl_ui_text_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Text_Data *sd)
797 _efl_ui_text_guide_update(obj, !sd->has_text); 797 _efl_ui_text_guide_update(obj, !sd->has_text);
798 efl_event_thaw(obj); 798 efl_event_thaw(obj);
799 799
800 efl_event_callback_call(obj, EFL_UI_LAYOUT_OBJECT_EVENT_THEME_CHANGED, NULL); 800 efl_event_callback_call(obj, EFL_UI_LAYOUT_EVENT_THEME_CHANGED, NULL);
801 801
802 evas_object_unref(obj); 802 evas_object_unref(obj);
803 803
diff --git a/src/lib/elementary/efl_ui_text.eo b/src/lib/elementary/efl_ui_text.eo
index af47765..0f4ab33 100644
--- a/src/lib/elementary/efl_ui_text.eo
+++ b/src/lib/elementary/efl_ui_text.eo
@@ -1,7 +1,7 @@
1/* FIXME - Text object must stop using elm_general! */ 1/* FIXME - Text object must stop using elm_general! */
2import elm_general; 2import elm_general;
3 3
4class Efl.Ui.Text (Efl.Ui.Layout.Object, Efl.Ui.Clickable, 4class Efl.Ui.Text (Efl.Ui.Layout, Efl.Ui.Clickable,
5 Efl.Access.Text, Efl.Access.Editable.Text, Efl.File, 5 Efl.Access.Text, Efl.Access.Editable.Text, Efl.File,
6 Efl.Ui.Selectable, Efl.Text_Interactive) 6 Efl.Ui.Selectable, Efl.Text_Interactive)
7{ 7{
diff --git a/src/lib/elementary/efl_ui_textpath.eo b/src/lib/elementary/efl_ui_textpath.eo
index d506d2b..917621c 100644
--- a/src/lib/elementary/efl_ui_textpath.eo
+++ b/src/lib/elementary/efl_ui_textpath.eo
@@ -4,7 +4,7 @@ enum Efl.Ui.Textpath_Direction {
4 ccw [[Counter-clockwise]] 4 ccw [[Counter-clockwise]]
5} 5}
6 6
7class Efl.Ui.Textpath (Efl.Ui.Layout.Object, Efl.Text, Efl.Gfx.Path) 7class Efl.Ui.Textpath (Efl.Ui.Layout, Efl.Text, Efl.Gfx.Path)
8{ 8{
9 [[Efl Ui Textpath class]] 9 [[Efl Ui Textpath class]]
10 legacy_prefix: elm_textpath; 10 legacy_prefix: elm_textpath;
diff --git a/src/lib/elementary/efl_ui_textpath_part.eo b/src/lib/elementary/efl_ui_textpath_part.eo
index bf76088..a603880 100644
--- a/src/lib/elementary/efl_ui_textpath_part.eo
+++ b/src/lib/elementary/efl_ui_textpath_part.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Textpath_Part (Efl.Ui.Layout.Part_Text) 1class Efl.Ui.Textpath_Part (Efl.Ui.Layout_Part_Text)
2{ 2{
3 [[Efl UI Textpath internal part class]] 3 [[Efl UI Textpath internal part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/efl_ui_timepicker.eo b/src/lib/elementary/efl_ui_timepicker.eo
index 54fd2b6..dc2682d 100644
--- a/src/lib/elementary/efl_ui_timepicker.eo
+++ b/src/lib/elementary/efl_ui_timepicker.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Timepicker (Efl.Ui.Layout.Object) 1class Efl.Ui.Timepicker (Efl.Ui.Layout)
2{ 2{
3 [[Timepicker widget 3 [[Timepicker widget
4 4
diff --git a/src/lib/elementary/efl_ui_video.eo b/src/lib/elementary/efl_ui_video.eo
index bbbfde6..8659752 100644
--- a/src/lib/elementary/efl_ui_video.eo
+++ b/src/lib/elementary/efl_ui_video.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Video (Efl.Ui.Layout.Object, Efl.Player, Efl.Access.Widget.Action) 1class Efl.Ui.Video (Efl.Ui.Layout, Efl.Player, Efl.Access.Widget.Action)
2{ 2{
3 [[Efl UI video class]] 3 [[Efl UI video class]]
4 legacy_prefix: elm_video; 4 legacy_prefix: elm_video;
diff --git a/src/lib/elementary/efl_ui_widget.c b/src/lib/elementary/efl_ui_widget.c
index 717f849..3ad54d3 100644
--- a/src/lib/elementary/efl_ui_widget.c
+++ b/src/lib/elementary/efl_ui_widget.c
@@ -237,7 +237,7 @@ _elm_widget_item_highlight_in_theme(Evas_Object *obj, Elm_Object_Item *eo_it)
237 { 237 {
238 Elm_Widget_Item_Data *it = efl_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS); 238 Elm_Widget_Item_Data *it = efl_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS);
239 239
240 if (efl_isa(it->view, EFL_UI_LAYOUT_OBJECT_CLASS)) 240 if (efl_isa(it->view, EFL_UI_LAYOUT_CLASS))
241 str = edje_object_data_get(elm_layout_edje_get(it->view), "focus_highlight"); 241 str = edje_object_data_get(elm_layout_edje_get(it->view), "focus_highlight");
242 else 242 else
243 str = edje_object_data_get(it->view, "focus_highlight"); 243 str = edje_object_data_get(it->view, "focus_highlight");
@@ -2839,7 +2839,7 @@ elm_widget_part_text_set(Eo *obj, const char *part, const char *label)
2839 /* legacy support: combobox was special (internal entry is text object). */ 2839 /* legacy support: combobox was special (internal entry is text object). */
2840 if (efl_isa(obj, ELM_COMBOBOX_CLASS)) 2840 if (efl_isa(obj, ELM_COMBOBOX_CLASS))
2841 _elm_combobox_part_text_set(obj, part, label); 2841 _elm_combobox_part_text_set(obj, part, label);
2842 else if (efl_isa(obj, EFL_UI_LAYOUT_OBJECT_CLASS)) 2842 else if (efl_isa(obj, EFL_UI_LAYOUT_CLASS))
2843 elm_layout_text_set(obj, part, label); 2843 elm_layout_text_set(obj, part, label);
2844} 2844}
2845 2845
@@ -2849,7 +2849,7 @@ elm_widget_part_text_get(const Eo *obj, const char *part)
2849 /* legacy support: combobox was special (internal entry is text object). */ 2849 /* legacy support: combobox was special (internal entry is text object). */
2850 if (efl_isa(obj, ELM_COMBOBOX_CLASS)) 2850 if (efl_isa(obj, ELM_COMBOBOX_CLASS))
2851 return _elm_combobox_part_text_get(obj, part); 2851 return _elm_combobox_part_text_get(obj, part);
2852 else if (efl_isa(obj, EFL_UI_LAYOUT_OBJECT_CLASS)) 2852 else if (efl_isa(obj, EFL_UI_LAYOUT_CLASS))
2853 return elm_layout_text_get(obj, part); 2853 return elm_layout_text_get(obj, part);
2854 2854
2855 return NULL; 2855 return NULL;
@@ -3504,7 +3504,7 @@ elm_widget_focus_highlight_focus_part_geometry_get(const Evas_Object *obj,
3504 if (!(target_hl_part = edje_object_data_get(edje_obj, "focus_part"))) 3504 if (!(target_hl_part = edje_object_data_get(edje_obj, "focus_part")))
3505 return; 3505 return;
3506 } 3506 }
3507 else if (obj && efl_isa(obj, EFL_UI_LAYOUT_OBJECT_CLASS)) 3507 else if (obj && efl_isa(obj, EFL_UI_LAYOUT_CLASS))
3508 { 3508 {
3509 edje_obj = elm_layout_edje_get(obj); 3509 edje_obj = elm_layout_edje_get(obj);
3510 if (!(target_hl_part = elm_layout_data_get(obj, "focus_part"))) 3510 if (!(target_hl_part = elm_layout_data_get(obj, "focus_part")))
@@ -5696,7 +5696,7 @@ EAPI void
5696elm_widget_content_part_set(Evas_Object *obj, const char *part, Evas_Object *content) 5696elm_widget_content_part_set(Evas_Object *obj, const char *part, Evas_Object *content)
5697{ 5697{
5698 ELM_WIDGET_CHECK(obj); 5698 ELM_WIDGET_CHECK(obj);
5699 if (efl_isa(obj, EFL_UI_LAYOUT_OBJECT_CLASS)) 5699 if (efl_isa(obj, EFL_UI_LAYOUT_CLASS))
5700 { 5700 {
5701 elm_layout_content_set(obj, part, content); 5701 elm_layout_content_set(obj, part, content);
5702 return; 5702 return;
@@ -5714,7 +5714,7 @@ EAPI Evas_Object *
5714elm_widget_content_part_get(const Evas_Object *obj, const char *part) 5714elm_widget_content_part_get(const Evas_Object *obj, const char *part)
5715{ 5715{
5716 ELM_WIDGET_CHECK(obj) NULL; 5716 ELM_WIDGET_CHECK(obj) NULL;
5717 if (efl_isa(obj, EFL_UI_LAYOUT_OBJECT_CLASS)) 5717 if (efl_isa(obj, EFL_UI_LAYOUT_CLASS))
5718 return elm_layout_content_get(obj, part); 5718 return elm_layout_content_get(obj, part);
5719 if (!efl_isa(obj, EFL_PART_INTERFACE)) return NULL; 5719 if (!efl_isa(obj, EFL_PART_INTERFACE)) return NULL;
5720 if (!part) 5720 if (!part)
@@ -5729,7 +5729,7 @@ EAPI Evas_Object *
5729elm_widget_content_part_unset(Evas_Object *obj, const char *part) 5729elm_widget_content_part_unset(Evas_Object *obj, const char *part)
5730{ 5730{
5731 ELM_WIDGET_CHECK(obj) NULL; 5731 ELM_WIDGET_CHECK(obj) NULL;
5732 if (efl_isa(obj, EFL_UI_LAYOUT_OBJECT_CLASS)) 5732 if (efl_isa(obj, EFL_UI_LAYOUT_CLASS))
5733 return elm_layout_content_unset(obj, part); 5733 return elm_layout_content_unset(obj, part);
5734 if (!efl_isa(obj, EFL_PART_INTERFACE)) return NULL; 5734 if (!efl_isa(obj, EFL_PART_INTERFACE)) return NULL;
5735 if (!part) 5735 if (!part)
@@ -5745,7 +5745,7 @@ elm_widget_signal_emit(Eo *obj, const char *emission, const char *source)
5745{ 5745{
5746 ELM_WIDGET_CHECK(obj); 5746 ELM_WIDGET_CHECK(obj);
5747 5747
5748 if (efl_isa(obj, EFL_UI_LAYOUT_OBJECT_CLASS)) 5748 if (efl_isa(obj, EFL_UI_LAYOUT_CLASS))
5749 elm_layout_signal_emit(obj, emission, source); 5749 elm_layout_signal_emit(obj, emission, source);
5750 else if (evas_object_smart_type_check(obj, "elm_icon")) 5750 else if (evas_object_smart_type_check(obj, "elm_icon"))
5751 { 5751 {
diff --git a/src/lib/elementary/elm_actionslider.eo b/src/lib/elementary/elm_actionslider.eo
index 07f7b09..8a9f4d3 100644
--- a/src/lib/elementary/elm_actionslider.eo
+++ b/src/lib/elementary/elm_actionslider.eo
@@ -10,7 +10,7 @@ enum Elm.Actionslider.Pos
10 all = (1 << 3) - 1 [[All positions for left/center/right.]] 10 all = (1 << 3) - 1 [[All positions for left/center/right.]]
11} 11}
12 12
13class Elm.Actionslider (Efl.Ui.Layout.Object, Efl.Ui.Selectable, Efl.Ui.Legacy) 13class Elm.Actionslider (Efl.Ui.Layout, Efl.Ui.Selectable, Efl.Ui.Legacy)
14{ 14{
15 [[An actionslider is a switcher for 2 or 3 labels 15 [[An actionslider is a switcher for 2 or 3 labels
16 16
diff --git a/src/lib/elementary/elm_actionslider_part.eo b/src/lib/elementary/elm_actionslider_part.eo
index ef44426..dee607a 100644
--- a/src/lib/elementary/elm_actionslider_part.eo
+++ b/src/lib/elementary/elm_actionslider_part.eo
@@ -1,4 +1,4 @@
1class Elm_Actionslider.Part (Efl.Ui.Layout.Part_Legacy) 1class Elm_Actionslider.Part (Efl.Ui.Layout_Part_Legacy)
2{ 2{
3 [[Elementary Actionslider internal part class]] 3 [[Elementary Actionslider internal part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/elm_bubble.eo b/src/lib/elementary/elm_bubble.eo
index 8905759..79e8baa 100644
--- a/src/lib/elementary/elm_bubble.eo
+++ b/src/lib/elementary/elm_bubble.eo
@@ -12,7 +12,7 @@ enum Elm.Bubble.Pos
12 bottom_right [[The arrow of the bubble points to the bottom right corner.]] 12 bottom_right [[The arrow of the bubble points to the bottom right corner.]]
13} 13}
14 14
15class Elm.Bubble (Efl.Ui.Layout.Object, Efl.Ui.Clickable, Efl.Ui.Legacy) 15class Elm.Bubble (Efl.Ui.Layout, Efl.Ui.Clickable, Efl.Ui.Legacy)
16{ 16{
17 [[Speech bubble widget used in messaging applications]] 17 [[Speech bubble widget used in messaging applications]]
18 18
diff --git a/src/lib/elementary/elm_bubble_part.eo b/src/lib/elementary/elm_bubble_part.eo
index 44911d6..8af7ff2 100644
--- a/src/lib/elementary/elm_bubble_part.eo
+++ b/src/lib/elementary/elm_bubble_part.eo
@@ -1,4 +1,4 @@
1class Elm_Bubble.Part (Efl.Ui.Layout.Part_Legacy) 1class Elm_Bubble.Part (Efl.Ui.Layout_Part_Legacy)
2{ 2{
3 [[Elementary Bubble internal part class]] 3 [[Elementary Bubble internal part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/elm_calendar.eo b/src/lib/elementary/elm_calendar.eo
index c646313..73d67b0 100644
--- a/src/lib/elementary/elm_calendar.eo
+++ b/src/lib/elementary/elm_calendar.eo
@@ -72,7 +72,7 @@ struct Elm.Calendar.Mark; [[Item handle for a calendar mark.
72 with @Elm.Calendar.mark_del. 72 with @Elm.Calendar.mark_del.
73 ]] 73 ]]
74 74
75class Elm.Calendar (Efl.Ui.Layout.Object, Efl.Ui.Focus.Composition, Efl.Access.Widget.Action, 75class Elm.Calendar (Efl.Ui.Layout, Efl.Ui.Focus.Composition, Efl.Access.Widget.Action,
76 Efl.Ui.Legacy) 76 Efl.Ui.Legacy)
77{ 77{
78 [[Calendar widget 78 [[Calendar widget
diff --git a/src/lib/elementary/elm_clock.eo b/src/lib/elementary/elm_clock.eo
index e01048d..b292fa5 100644
--- a/src/lib/elementary/elm_clock.eo
+++ b/src/lib/elementary/elm_clock.eo
@@ -18,7 +18,7 @@ enum Elm.Clock.Edit_Mode
18 all = (1 << 6) - 1 [[All digits should be editable.]] 18 all = (1 << 6) - 1 [[All digits should be editable.]]
19} 19}
20 20
21class Elm.Clock (Efl.Ui.Layout.Object, Efl.Ui.Focus.Composition, Efl.Ui.Legacy) 21class Elm.Clock (Efl.Ui.Layout, Efl.Ui.Focus.Composition, Efl.Ui.Legacy)
22{ 22{
23 [[Digital clock widget 23 [[Digital clock widget
24 24
diff --git a/src/lib/elementary/elm_code_widget.eo b/src/lib/elementary/elm_code_widget.eo
index 6143116..8f9ff0d 100644
--- a/src/lib/elementary/elm_code_widget.eo
+++ b/src/lib/elementary/elm_code_widget.eo
@@ -4,7 +4,7 @@ import elm_interface_scrollable;
4struct @extern Elm.Code; [[Elementary code main data structure]] /* The main interface currently defined in code */ 4struct @extern Elm.Code; [[Elementary code main data structure]] /* The main interface currently defined in code */
5struct @extern Elm.Code_Line; [[Elementary code line data structure]] /* Parts of the interface currently defined in code */ 5struct @extern Elm.Code_Line; [[Elementary code line data structure]] /* Parts of the interface currently defined in code */
6 6
7class Elm.Code_Widget (Efl.Ui.Layout.Object, Efl.Access.Text) 7class Elm.Code_Widget (Efl.Ui.Layout, Efl.Access.Text)
8{ 8{
9 [[Elementary code widget]] 9 [[Elementary code widget]]
10 eo_prefix: elm_obj_code_widget; 10 eo_prefix: elm_obj_code_widget;
diff --git a/src/lib/elementary/elm_colorselector.eo b/src/lib/elementary/elm_colorselector.eo
index 3b106df..e8d719f 100644
--- a/src/lib/elementary/elm_colorselector.eo
+++ b/src/lib/elementary/elm_colorselector.eo
@@ -12,7 +12,7 @@ enum Elm.Colorselector.Mode
12 all [[All possible color selector is displayed.]] 12 all [[All possible color selector is displayed.]]
13} 13}
14 14
15class Elm.Colorselector (Efl.Ui.Layout.Object, Efl.Ui.Focus.Composition, 15class Elm.Colorselector (Efl.Ui.Layout, Efl.Ui.Focus.Composition,
16 Efl.Access.Widget.Action, Efl.Ui.Clickable, Efl.Ui.Legacy) 16 Efl.Access.Widget.Action, Efl.Ui.Clickable, Efl.Ui.Legacy)
17{ 17{
18 [[Elementary colorselector class]] 18 [[Elementary colorselector class]]
diff --git a/src/lib/elementary/elm_conformant.eo b/src/lib/elementary/elm_conformant.eo
index 8026cc0..37cba06 100644
--- a/src/lib/elementary/elm_conformant.eo
+++ b/src/lib/elementary/elm_conformant.eo
@@ -1,4 +1,4 @@
1class Elm.Conformant (Efl.Ui.Layout.Object, Efl.Ui.Legacy) 1class Elm.Conformant (Efl.Ui.Layout, Efl.Ui.Legacy)
2{ 2{
3 [[Elementary conformant class]] 3 [[Elementary conformant class]]
4 legacy_prefix: elm_conformant; 4 legacy_prefix: elm_conformant;
diff --git a/src/lib/elementary/elm_ctxpopup.eo b/src/lib/elementary/elm_ctxpopup.eo
index af3617b..7199aa7 100644
--- a/src/lib/elementary/elm_ctxpopup.eo
+++ b/src/lib/elementary/elm_ctxpopup.eo
@@ -8,7 +8,7 @@ enum Elm.Ctxpopup.Direction
8 unknown [[Ctxpopup does not determine it's direction yet.]] 8 unknown [[Ctxpopup does not determine it's direction yet.]]
9} 9}
10 10
11class Elm.Ctxpopup (Efl.Ui.Layout.Object, Efl.Ui.Focus.Layer, Efl.Access.Widget.Action, Efl.Ui.Legacy) 11class Elm.Ctxpopup (Efl.Ui.Layout, Efl.Ui.Focus.Layer, Efl.Access.Widget.Action, Efl.Ui.Legacy)
12{ 12{
13 [[Elementary context popup class]] 13 [[Elementary context popup class]]
14 legacy_prefix: elm_ctxpopup; 14 legacy_prefix: elm_ctxpopup;
diff --git a/src/lib/elementary/elm_ctxpopup_part.eo b/src/lib/elementary/elm_ctxpopup_part.eo
index 53c5c05..301cee9 100644
--- a/src/lib/elementary/elm_ctxpopup_part.eo
+++ b/src/lib/elementary/elm_ctxpopup_part.eo
@@ -1,4 +1,4 @@
1class Elm.Ctxpopup.Part (Efl.Ui.Layout.Part_Legacy) 1class Elm.Ctxpopup.Part (Efl.Ui.Layout_Part_Legacy)
2{ 2{
3 [[Elementary contex popup internal part class]] 3 [[Elementary contex popup internal part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/elm_dayselector.eo b/src/lib/elementary/elm_dayselector.eo
index 13017f1..56b3504 100644
--- a/src/lib/elementary/elm_dayselector.eo
+++ b/src/lib/elementary/elm_dayselector.eo
@@ -17,7 +17,7 @@ enum Elm.Dayselector.Day
17 max [[Sentinel value to indicate last enum field during iteration]] 17 max [[Sentinel value to indicate last enum field during iteration]]
18} 18}
19 19
20class Elm.Dayselector (Efl.Ui.Layout.Object, Efl.Ui.Legacy) 20class Elm.Dayselector (Efl.Ui.Layout, Efl.Ui.Legacy)
21{ 21{
22 [[Elementary dayselector class]] 22 [[Elementary dayselector class]]
23 legacy_prefix: elm_dayselector; 23 legacy_prefix: elm_dayselector;
diff --git a/src/lib/elementary/elm_dayselector_part.eo b/src/lib/elementary/elm_dayselector_part.eo
index 7ed920a..f48c5c7 100644
--- a/src/lib/elementary/elm_dayselector_part.eo
+++ b/src/lib/elementary/elm_dayselector_part.eo
@@ -1,4 +1,4 @@
1class Elm.Dayselector.Part (Efl.Ui.Layout.Part_Legacy) 1class Elm.Dayselector.Part (Efl.Ui.Layout_Part_Legacy)
2{ 2{
3 [[Elementary dayselector internal part class]] 3 [[Elementary dayselector internal part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index c4a4344..b4ad237 100644
--- a/src/lib/elementary/elm_entry.c
+++ b/src/lib/elementary/elm_entry.c
@@ -1007,7 +1007,7 @@ _elm_entry_efl_ui_widget_theme_apply(Eo *obj, Elm_Entry_Data *sd)
1007 evas_event_thaw(evas_object_evas_get(obj)); 1007 evas_event_thaw(evas_object_evas_get(obj));
1008 evas_event_thaw_eval(evas_object_evas_get(obj)); 1008 evas_event_thaw_eval(evas_object_evas_get(obj));
1009 1009
1010 efl_event_callback_legacy_call(obj, EFL_UI_LAYOUT_OBJECT_EVENT_THEME_CHANGED, NULL); 1010 efl_event_callback_legacy_call(obj, EFL_UI_LAYOUT_EVENT_THEME_CHANGED, NULL);
1011 1011
1012 evas_object_unref(obj); 1012 evas_object_unref(obj);
1013 1013
diff --git a/src/lib/elementary/elm_entry.eo b/src/lib/elementary/elm_entry.eo
index 7d98bef..3275b0f 100644
--- a/src/lib/elementary/elm_entry.eo
+++ b/src/lib/elementary/elm_entry.eo
@@ -3,7 +3,7 @@ import elm_general;
3type Elm_Entry_Item_Provider_Cb: __undefined_type; [[Elementary entry item provider callback type]] 3type Elm_Entry_Item_Provider_Cb: __undefined_type; [[Elementary entry item provider callback type]]
4type Elm_Entry_Filter_Cb: __undefined_type; [[Elementary entry filter callback type]] 4type Elm_Entry_Filter_Cb: __undefined_type; [[Elementary entry filter callback type]]
5 5
6class Elm.Entry (Efl.Ui.Layout.Object, Elm.Interface_Scrollable, Efl.Ui.Clickable, 6class Elm.Entry (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
7 Efl.Access.Text, Efl.Access.Editable.Text, Efl.File, 7 Efl.Access.Text, Efl.Access.Editable.Text, Efl.File,
8 Efl.Ui.Selectable, Efl.Ui.Scrollable, Efl.Access.Widget.Action, 8 Efl.Ui.Selectable, Efl.Ui.Scrollable, Efl.Access.Widget.Action,
9 Efl.Ui.Legacy) 9 Efl.Ui.Legacy)
diff --git a/src/lib/elementary/elm_entry_part.eo b/src/lib/elementary/elm_entry_part.eo
index bf349b6..8b33908 100644
--- a/src/lib/elementary/elm_entry_part.eo
+++ b/src/lib/elementary/elm_entry_part.eo
@@ -1,4 +1,4 @@
1class Elm.Entry.Part (Efl.Ui.Layout.Part_Legacy) 1class Elm.Entry.Part (Efl.Ui.Layout_Part_Legacy)
2{ 2{
3 [[Elementary entry internal part class]] 3 [[Elementary entry internal part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/elm_fileselector.eo b/src/lib/elementary/elm_fileselector.eo
index 5ebf4d0..ffadc12 100644
--- a/src/lib/elementary/elm_fileselector.eo
+++ b/src/lib/elementary/elm_fileselector.eo
@@ -1,4 +1,4 @@
1class Elm.Fileselector (Efl.Ui.Layout.Object, Elm.Interface.Fileselector, 1class Elm.Fileselector (Efl.Ui.Layout, Elm.Interface.Fileselector,
2 Efl.Access.Widget.Action, Efl.Ui.Focus.Composition, 2 Efl.Access.Widget.Action, Efl.Ui.Focus.Composition,
3 Efl.Ui.Clickable, Efl.Ui.Selectable, Efl.Ui.Legacy) 3 Efl.Ui.Clickable, Efl.Ui.Selectable, Efl.Ui.Legacy)
4{ 4{
diff --git a/src/lib/elementary/elm_fileselector_entry.eo b/src/lib/elementary/elm_fileselector_entry.eo
index 4e5a6a8..29609f3 100644
--- a/src/lib/elementary/elm_fileselector_entry.eo
+++ b/src/lib/elementary/elm_fileselector_entry.eo
@@ -1,4 +1,4 @@
1class Elm.Fileselector_Entry (Efl.Ui.Layout.Object, Elm.Interface.Fileselector, 1class Elm.Fileselector_Entry (Efl.Ui.Layout, Elm.Interface.Fileselector,
2 Efl.Ui.Clickable, Efl.Ui.Selectable, Efl.Ui.Legacy) 2 Efl.Ui.Clickable, Efl.Ui.Selectable, Efl.Ui.Legacy)
3{ 3{
4 [[Elementary fileselector entry class]] 4 [[Elementary fileselector entry class]]
diff --git a/src/lib/elementary/elm_fileselector_entry_part.eo b/src/lib/elementary/elm_fileselector_entry_part.eo
index 383da59..3011f21 100644
--- a/src/lib/elementary/elm_fileselector_entry_part.eo
+++ b/src/lib/elementary/elm_fileselector_entry_part.eo
@@ -1,4 +1,4 @@
1class Elm.Fileselector.Entry.Part (Efl.Ui.Layout.Part_Legacy) 1class Elm.Fileselector.Entry.Part (Efl.Ui.Layout_Part_Legacy)
2{ 2{
3 [[Elementary fileselector entry internal part class]] 3 [[Elementary fileselector entry internal part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/elm_fileselector_part.eo b/src/lib/elementary/elm_fileselector_part.eo
index bdc00c7..e32512b 100644
--- a/src/lib/elementary/elm_fileselector_part.eo
+++ b/src/lib/elementary/elm_fileselector_part.eo
@@ -1,4 +1,4 @@
1class Elm.Fileselector.Part (Efl.Ui.Layout.Part_Legacy) 1class Elm.Fileselector.Part (Efl.Ui.Layout_Part_Legacy)
2{ 2{
3 [[Elementary fileselector entry internal part class]] 3 [[Elementary fileselector entry internal part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/elm_flipselector.eo b/src/lib/elementary/elm_flipselector.eo
index 570c642..e1533b0 100644
--- a/src/lib/elementary/elm_flipselector.eo
+++ b/src/lib/elementary/elm_flipselector.eo
@@ -1,4 +1,4 @@
1class Elm.Flipselector (Efl.Ui.Layout.Object, Efl.Ui.Range, 1class Elm.Flipselector (Efl.Ui.Layout, Efl.Ui.Range,
2 Efl.Access.Widget.Action, 2 Efl.Access.Widget.Action,
3 Efl.Ui.Selectable, Efl.Ui.Legacy) 3 Efl.Ui.Selectable, Efl.Ui.Legacy)
4{ 4{
diff --git a/src/lib/elementary/elm_gengrid.eo b/src/lib/elementary/elm_gengrid.eo
index 671831a..33d260f 100644
--- a/src/lib/elementary/elm_gengrid.eo
+++ b/src/lib/elementary/elm_gengrid.eo
@@ -9,7 +9,7 @@ enum Elm.Gengrid.Reorder_Type
9 swap [[Swap reorder type]] 9 swap [[Swap reorder type]]
10} 10}
11 11
12class Elm.Gengrid (Efl.Ui.Layout.Object, Efl.Ui.Focus.Composition, Elm.Interface_Scrollable, 12class Elm.Gengrid (Efl.Ui.Layout, Efl.Ui.Focus.Composition, Elm.Interface_Scrollable,
13 Efl.Ui.Clickable, Efl.Access.Widget.Action, 13 Efl.Ui.Clickable, Efl.Access.Widget.Action,
14 Efl.Access.Selection, Efl.Ui.Legacy) 14 Efl.Access.Selection, Efl.Ui.Legacy)
15{ 15{
diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c
index d966024..aaa183a 100644
--- a/src/lib/elementary/elm_genlist.c
+++ b/src/lib/elementary/elm_genlist.c
@@ -453,7 +453,7 @@ _item_content_realize(Elm_Gen_Item *it,
453 ELM_WIDGET_DATA_GET_OR_RETURN(content, wd); 453 ELM_WIDGET_DATA_GET_OR_RETURN(content, wd);
454 454
455 // FIXME : Layout need sizing eval before group calculate 455 // FIXME : Layout need sizing eval before group calculate
456 if (efl_class_get(content) == EFL_UI_LAYOUT_OBJECT_CLASS) 456 if (efl_class_get(content) == EFL_UI_LAYOUT_CLASS)
457 elm_layout_sizing_eval(content); 457 elm_layout_sizing_eval(content);
458 458
459 _widget_calculate_recursive(content); 459 _widget_calculate_recursive(content);
diff --git a/src/lib/elementary/elm_genlist.eo b/src/lib/elementary/elm_genlist.eo
index c1317ae..3e8835d 100644
--- a/src/lib/elementary/elm_genlist.eo
+++ b/src/lib/elementary/elm_genlist.eo
@@ -1,6 +1,6 @@
1import elm_general; 1import elm_general;
2 2
3class Elm.Genlist (Efl.Ui.Layout.Object, Elm.Interface_Scrollable, Efl.Ui.Clickable, 3class Elm.Genlist (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
4 Efl.Access.Widget.Action, Efl.Access.Selection, 4 Efl.Access.Widget.Action, Efl.Access.Selection,
5 Efl.Ui.Selectable, Efl.Ui.Legacy) 5 Efl.Ui.Selectable, Efl.Ui.Legacy)
6{ 6{
diff --git a/src/lib/elementary/elm_hover.eo b/src/lib/elementary/elm_hover.eo
index 35f744b..5f6f633 100644
--- a/src/lib/elementary/elm_hover.eo
+++ b/src/lib/elementary/elm_hover.eo
@@ -7,7 +7,7 @@ enum Elm.Hover.Axis
7 both [[ELM_HOVER_AXIS_BOTH -- both.]] 7 both [[ELM_HOVER_AXIS_BOTH -- both.]]
8} 8}
9 9
10class Elm.Hover (Efl.Ui.Layout.Object, Efl.Ui.Focus.Layer, Efl.Ui.Clickable, 10class Elm.Hover (Efl.Ui.Layout, Efl.Ui.Focus.Layer, Efl.Ui.Clickable,
11 Efl.Access.Widget.Action, Efl.Ui.Legacy) 11 Efl.Access.Widget.Action, Efl.Ui.Legacy)
12{ 12{
13 [[Elementary hover class]] 13 [[Elementary hover class]]
diff --git a/src/lib/elementary/elm_hover_part.eo b/src/lib/elementary/elm_hover_part.eo
index 7bdb717..7059f73 100644
--- a/src/lib/elementary/elm_hover_part.eo
+++ b/src/lib/elementary/elm_hover_part.eo
@@ -1,4 +1,4 @@
1class Elm.Hover.Part (Efl.Ui.Layout.Part_Legacy) 1class Elm.Hover.Part (Efl.Ui.Layout_Part_Legacy)
2{ 2{
3 [[elementary hover internal part class]] 3 [[elementary hover internal part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/elm_index.eo b/src/lib/elementary/elm_index.eo
index 9916adc..3b6bd22 100644
--- a/src/lib/elementary/elm_index.eo
+++ b/src/lib/elementary/elm_index.eo
@@ -1,4 +1,4 @@
1class Elm.Index (Efl.Ui.Layout.Object, Efl.Ui.Direction, 1class Elm.Index (Efl.Ui.Layout, Efl.Ui.Direction,
2 Efl.Ui.Clickable, Efl.Ui.Selectable, Efl.Ui.Legacy) 2 Efl.Ui.Clickable, Efl.Ui.Selectable, Efl.Ui.Legacy)
3{ 3{
4 [[elementary index class]] 4 [[elementary index class]]
diff --git a/src/lib/elementary/elm_inwin.eo b/src/lib/elementary/elm_inwin.eo
index 82d7530..0b6acf9 100644
--- a/src/lib/elementary/elm_inwin.eo
+++ b/src/lib/elementary/elm_inwin.eo
@@ -1,4 +1,4 @@
1class Elm.Inwin (Efl.Ui.Layout.Object, Efl.Ui.Focus.Layer, Efl.Content, Efl.Ui.Legacy) 1class Elm.Inwin (Efl.Ui.Layout, Efl.Ui.Focus.Layer, Efl.Content, Efl.Ui.Legacy)
2{ 2{
3 [[Elementary inwin class]] 3 [[Elementary inwin class]]
4 legacy_prefix: elm_inwin; 4 legacy_prefix: elm_inwin;
diff --git a/src/lib/elementary/elm_label.eo b/src/lib/elementary/elm_label.eo
index 6e5e9dc..6afa5ac 100644
--- a/src/lib/elementary/elm_label.eo
+++ b/src/lib/elementary/elm_label.eo
@@ -8,7 +8,7 @@ enum Elm.Label.Slide_Mode
8 always [[Slide always.]] 8 always [[Slide always.]]
9} 9}
10 10
11class Elm.Label (Efl.Ui.Layout.Object, Efl.Ui.Legacy) 11class Elm.Label (Efl.Ui.Layout, Efl.Ui.Legacy)
12{ 12{
13 [[Elementary label class]] 13 [[Elementary label class]]
14 legacy_prefix: elm_label; 14 legacy_prefix: elm_label;
diff --git a/src/lib/elementary/elm_label_part.eo b/src/lib/elementary/elm_label_part.eo
index e62729a..9b866bc 100644
--- a/src/lib/elementary/elm_label_part.eo
+++ b/src/lib/elementary/elm_label_part.eo
@@ -1,4 +1,4 @@
1class Elm_Label.Part (Efl.Ui.Layout.Part_Legacy) 1class Elm_Label.Part (Efl.Ui.Layout_Part_Legacy)
2{ 2{
3 [[Elementary button internal part class]] 3 [[Elementary button internal part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/elm_layout.h b/src/lib/elementary/elm_layout.h
index d3205bc..a59fd7c 100644
--- a/src/lib/elementary/elm_layout.h
+++ b/src/lib/elementary/elm_layout.h
@@ -168,7 +168,7 @@
168 168
169#include <elm_layout_common.h> 169#include <elm_layout_common.h>
170#ifdef EFL_EO_API_SUPPORT 170#ifdef EFL_EO_API_SUPPORT
171#include <efl_ui_layout_object.eo.h> 171#include <efl_ui_layout.eo.h>
172#endif 172#endif
173#ifndef EFL_NOLEGACY_API_SUPPORT 173#ifndef EFL_NOLEGACY_API_SUPPORT
174#include <elm_layout_legacy.h> 174#include <elm_layout_legacy.h>
diff --git a/src/lib/elementary/elm_layout_legacy.h b/src/lib/elementary/elm_layout_legacy.h
index a22f16e..58dab5b 100644
--- a/src/lib/elementary/elm_layout_legacy.h
+++ b/src/lib/elementary/elm_layout_legacy.h
@@ -712,4 +712,4 @@ EAPI const char *elm_layout_part_cursor_style_get(const Evas_Object *obj, const
712 */ 712 */
713EAPI Eina_Bool elm_layout_part_cursor_unset(Evas_Object *obj, const char *part_name); 713EAPI Eina_Bool elm_layout_part_cursor_unset(Evas_Object *obj, const char *part_name);
714 714
715#include "efl_ui_layout_object.eo.legacy.h" 715#include "efl_ui_layout.eo.legacy.h"
diff --git a/src/lib/elementary/elm_list.eo b/src/lib/elementary/elm_list.eo
index f09c529..8d75422 100644
--- a/src/lib/elementary/elm_list.eo
+++ b/src/lib/elementary/elm_list.eo
@@ -1,6 +1,6 @@
1import elm_general; 1import elm_general;
2 2
3class Elm.List (Efl.Ui.Layout.Object, Elm.Interface_Scrollable, 3class Elm.List (Efl.Ui.Layout, Elm.Interface_Scrollable,
4 Efl.Access.Widget.Action, Efl.Access.Selection, Efl.Access.Object, 4 Efl.Access.Widget.Action, Efl.Access.Selection, Efl.Access.Object,
5 Efl.Ui.Clickable, Efl.Ui.Selectable, Efl.Ui.Legacy) 5 Efl.Ui.Clickable, Efl.Ui.Selectable, Efl.Ui.Legacy)
6{ 6{
diff --git a/src/lib/elementary/elm_main.c b/src/lib/elementary/elm_main.c
index ec17c73..0b0b213 100644
--- a/src/lib/elementary/elm_main.c
+++ b/src/lib/elementary/elm_main.c
@@ -1460,7 +1460,7 @@ elm_object_domain_translatable_part_text_set(Evas_Object *obj, const char *part,
1460 { 1460 {
1461 if (!part) 1461 if (!part)
1462 part = efl_ui_widget_default_text_part_get(obj); 1462 part = efl_ui_widget_default_text_part_get(obj);
1463 else if (efl_isa(obj, EFL_UI_LAYOUT_OBJECT_CLASS)) 1463 else if (efl_isa(obj, EFL_UI_LAYOUT_CLASS))
1464 _elm_layout_part_aliasing_eval(obj, &part, EINA_TRUE); 1464 _elm_layout_part_aliasing_eval(obj, &part, EINA_TRUE);
1465 1465
1466 elm_widget_part_translatable_text_set(obj, part, text, domain); 1466 elm_widget_part_translatable_text_set(obj, part, text, domain);
@@ -1482,7 +1482,7 @@ elm_object_translatable_part_text_get(const Evas_Object *obj, const char *part)
1482 { 1482 {
1483 if (!part) 1483 if (!part)
1484 part = efl_ui_widget_default_text_part_get(obj); 1484 part = efl_ui_widget_default_text_part_get(obj);
1485 else if (efl_isa(obj, EFL_UI_LAYOUT_OBJECT_CLASS)) 1485 else if (efl_isa(obj, EFL_UI_LAYOUT_CLASS))
1486 _elm_layout_part_aliasing_eval(obj, &part, EINA_TRUE); 1486 _elm_layout_part_aliasing_eval(obj, &part, EINA_TRUE);
1487 1487
1488 return elm_widget_part_translatable_text_get(obj, part, NULL); 1488 return elm_widget_part_translatable_text_get(obj, part, NULL);
diff --git a/src/lib/elementary/elm_multibuttonentry.eo b/src/lib/elementary/elm_multibuttonentry.eo
index bb8b062..b78b8d6 100644
--- a/src/lib/elementary/elm_multibuttonentry.eo
+++ b/src/lib/elementary/elm_multibuttonentry.eo
@@ -1,7 +1,7 @@
1type Elm_Multibuttonentry_Item_Filter_Cb: __undefined_type; [[Elementary multibuttonentry item filter callback type]] 1type Elm_Multibuttonentry_Item_Filter_Cb: __undefined_type; [[Elementary multibuttonentry item filter callback type]]
2type Elm_Multibuttonentry_Format_Cb: __undefined_type; [[Elementary multibuttonentry format callback type]] 2type Elm_Multibuttonentry_Format_Cb: __undefined_type; [[Elementary multibuttonentry format callback type]]
3 3
4class Elm.Multibuttonentry (Efl.Ui.Layout.Object, Efl.Ui.Clickable, Efl.Ui.Legacy) 4class Elm.Multibuttonentry (Efl.Ui.Layout, Efl.Ui.Clickable, Efl.Ui.Legacy)
5{ 5{
6 [[Elementary multibuttonentry class]] 6 [[Elementary multibuttonentry class]]
7 legacy_prefix: elm_multibuttonentry; 7 legacy_prefix: elm_multibuttonentry;
diff --git a/src/lib/elementary/elm_multibuttonentry_part.eo b/src/lib/elementary/elm_multibuttonentry_part.eo
index a0cafc5..05d507a 100644
--- a/src/lib/elementary/elm_multibuttonentry_part.eo
+++ b/src/lib/elementary/elm_multibuttonentry_part.eo
@@ -1,4 +1,4 @@
1class Elm.Multibuttonentry_Part (Efl.Ui.Layout.Part_Legacy) 1class Elm.Multibuttonentry_Part (Efl.Ui.Layout_Part_Legacy)
2{ 2{
3 [[Elementary multibuttonentry internal part class]] 3 [[Elementary multibuttonentry internal part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/elm_naviframe.eo b/src/lib/elementary/elm_naviframe.eo
index 47c41bd..039cb03 100644
--- a/src/lib/elementary/elm_naviframe.eo
+++ b/src/lib/elementary/elm_naviframe.eo
@@ -1,4 +1,4 @@
1class Elm.Naviframe (Efl.Ui.Layout.Object, Efl.Access.Widget.Action, Efl.Ui.Legacy) 1class Elm.Naviframe (Efl.Ui.Layout, Efl.Access.Widget.Action, Efl.Ui.Legacy)
2{ 2{
3 [[Elementary naviframe class]] 3 [[Elementary naviframe class]]
4 legacy_prefix: elm_naviframe; 4 legacy_prefix: elm_naviframe;
diff --git a/src/lib/elementary/elm_naviframe_part.eo b/src/lib/elementary/elm_naviframe_part.eo
index a84559f..53e5174 100644
--- a/src/lib/elementary/elm_naviframe_part.eo
+++ b/src/lib/elementary/elm_naviframe_part.eo
@@ -1,4 +1,4 @@
1class Elm.Naviframe.Part (Efl.Ui.Layout.Part_Legacy) 1class Elm.Naviframe.Part (Efl.Ui.Layout_Part_Legacy)
2{ 2{
3 [[Elementary naviframe internal part class]] 3 [[Elementary naviframe internal part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/elm_panel.eo b/src/lib/elementary/elm_panel.eo
index be8bdc5..d4fe178 100644
--- a/src/lib/elementary/elm_panel.eo
+++ b/src/lib/elementary/elm_panel.eo
@@ -8,7 +8,7 @@ enum Elm.Panel.Orient
8 right [[Panel (dis)appears from the right]] 8 right [[Panel (dis)appears from the right]]
9} 9}
10 10
11class Elm.Panel (Efl.Ui.Layout.Object, Efl.Ui.Focus.Layer, Elm.Interface_Scrollable, 11class Elm.Panel (Efl.Ui.Layout, Efl.Ui.Focus.Layer, Elm.Interface_Scrollable,
12 Efl.Access.Widget.Action, Efl.Ui.Legacy) 12 Efl.Access.Widget.Action, Efl.Ui.Legacy)
13{ 13{
14 [[Elementary panel class]] 14 [[Elementary panel class]]
diff --git a/src/lib/elementary/elm_player.eo b/src/lib/elementary/elm_player.eo
index e8f607c..bc7c440 100644
--- a/src/lib/elementary/elm_player.eo
+++ b/src/lib/elementary/elm_player.eo
@@ -1,4 +1,4 @@
1class Elm.Player (Efl.Ui.Layout.Object, Efl.Access.Widget.Action, Efl.Ui.Legacy) 1class Elm.Player (Efl.Ui.Layout, Efl.Access.Widget.Action, Efl.Ui.Legacy)
2{ 2{
3 [[Elementary player class]] 3 [[Elementary player class]]
4 legacy_prefix: elm_player; 4 legacy_prefix: elm_player;
diff --git a/src/lib/elementary/elm_player_part.eo b/src/lib/elementary/elm_player_part.eo
index 1bbe7ee..a09361d 100644
--- a/src/lib/elementary/elm_player_part.eo
+++ b/src/lib/elementary/elm_player_part.eo
@@ -1,4 +1,4 @@
1class Elm.Player.Part (Efl.Ui.Layout.Part_Legacy) 1class Elm.Player.Part (Efl.Ui.Layout_Part_Legacy)
2{ 2{
3 [[Elementary player internal part class]] 3 [[Elementary player internal part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/elm_popup.eo b/src/lib/elementary/elm_popup.eo
index 772504d..e0988f7 100644
--- a/src/lib/elementary/elm_popup.eo
+++ b/src/lib/elementary/elm_popup.eo
@@ -23,7 +23,7 @@ enum Elm.Popup.Orient
23} 23}
24 24
25 25
26class Elm.Popup (Efl.Ui.Layout.Object, Efl.Access.Widget.Action, Efl.Ui.Legacy) 26class Elm.Popup (Efl.Ui.Layout, Efl.Access.Widget.Action, Efl.Ui.Legacy)
27{ 27{
28 [[Elementary popup class]] 28 [[Elementary popup class]]
29 legacy_prefix: elm_popup; 29 legacy_prefix: elm_popup;
diff --git a/src/lib/elementary/elm_popup_part.eo b/src/lib/elementary/elm_popup_part.eo
index ead1583..cf03770 100644
--- a/src/lib/elementary/elm_popup_part.eo
+++ b/src/lib/elementary/elm_popup_part.eo
@@ -1,4 +1,4 @@
1class Elm.Popup.Part (Efl.Ui.Layout.Part_Legacy) 1class Elm.Popup.Part (Efl.Ui.Layout_Part_Legacy)
2{ 2{
3 [[Elementary popup internal part class]] 3 [[Elementary popup internal part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/elm_scroller.eo b/src/lib/elementary/elm_scroller.eo
index 7824a4c..51842f6 100644
--- a/src/lib/elementary/elm_scroller.eo
+++ b/src/lib/elementary/elm_scroller.eo
@@ -1,4 +1,4 @@
1class Elm.Scroller (Efl.Ui.Layout.Object, Elm.Interface_Scrollable, 1class Elm.Scroller (Efl.Ui.Layout, Elm.Interface_Scrollable,
2 Efl.Access.Widget.Action, 2 Efl.Access.Widget.Action,
3 Efl.Ui.Scrollable, Efl.Content, Efl.Ui.Legacy) 3 Efl.Ui.Scrollable, Efl.Content, Efl.Ui.Legacy)
4{ 4{
diff --git a/src/lib/elementary/elm_scroller_part.eo b/src/lib/elementary/elm_scroller_part.eo
index de187cd..f038f7b 100644
--- a/src/lib/elementary/elm_scroller_part.eo
+++ b/src/lib/elementary/elm_scroller_part.eo
@@ -1,4 +1,4 @@
1class Elm.Scroller.Part (Efl.Ui.Layout.Part_Legacy) 1class Elm.Scroller.Part (Efl.Ui.Layout_Part_Legacy)
2{ 2{
3 [[Elementary scroller internal part class]] 3 [[Elementary scroller internal part class]]
4 data: null; 4 data: null;
diff --git a/src/lib/elementary/elm_segment_control.eo b/src/lib/elementary/elm_segment_control.eo
index f43efae..76db936 100644
--- a/src/lib/elementary/elm_segment_control.eo
+++ b/src/lib/elementary/elm_segment_control.eo
@@ -1,4 +1,4 @@
1class Elm.Segment_Control (Efl.Ui.Layout.Object, Efl.Ui.Focus.Composition, Efl.Ui.Legacy) 1class Elm.Segment_Control (Efl.Ui.Layout, Efl.Ui.Focus.Composition, Efl.Ui.Legacy)
2{ 2{
3 [[Elementary segment control class]] 3 [[Elementary segment control class]]
4 legacy_prefix: elm_segment_control; 4 legacy_prefix: elm_segment_control;
diff --git a/src/lib/elementary/elm_separator.eo b/src/lib/elementary/elm_separator.eo
index 136311d..c29585d 100644
--- a/src/lib/elementary/elm_separator.eo
+++ b/src/lib/elementary/elm_separator.eo
@@ -1,4 +1,4 @@
1class Elm.Separator (Efl.Ui.Layout.Object, Efl.Ui.Legacy) 1class Elm.Separator (Efl.Ui.Layout, Efl.Ui.Legacy)
2{ 2{
3 [[Elementary separator class]] 3 [[Elementary separator class]]
4 legacy_prefix: elm_separator; 4 legacy_prefix: elm_separator;
diff --git a/src/lib/elementary/elm_slider_part_indicator.eo b/src/lib/elementary/elm_slider_part_indicator.eo
index f54777b..7369825 100644
--- a/src/lib/elementary/elm_slider_part_indicator.eo
+++ b/src/lib/elementary/elm_slider_part_indicator.eo
@@ -1,6 +1,6 @@
1import efl_ui; 1import efl_ui;
2 2
3class Elm.Slider_Part_Indicator (Efl.Ui.Layout.Part, Efl.Ui.Format) 3class Elm.Slider_Part_Indicator (Efl.Ui.Layout_Part, Efl.Ui.Format)
4{ 4{
5 [[Elementary slider internal part class]] 5 [[Elementary slider internal part class]]
6 data: null; 6 data: null;
diff --git a/src/lib/elementary/elm_slideshow.eo b/src/lib/elementary/elm_slideshow.eo
index cdaf8d6..b51ee63 100644
--- a/src/lib/elementary/elm_slideshow.eo
+++ b/src/lib/elementary/elm_slideshow.eo
@@ -1,6 +1,6 @@
1type Elm_Slideshow_Item_Class: __undefined_type; [[Elementary slideshow item class type]] 1type Elm_Slideshow_Item_Class: __undefined_type; [[Elementary slideshow item class type]]
2 2
3class Elm.Slideshow (Efl.Ui.Layout.Object, Efl.Access.Widget.Action, Efl.Ui.Legacy) 3class Elm.Slideshow (Efl.Ui.Layout, Efl.Access.Widget.Action, Efl.Ui.Legacy)
4{ 4{
5 [[Elementary slideshow class]] 5 [[Elementary slideshow class]]
6 eo_prefix: elm_obj_slideshow; 6 eo_prefix: elm_obj_slideshow;
diff --git a/src/lib/elementary/elm_spinner.eo b/src/lib/elementary/elm_spinner.eo
index c5d1add..326354f 100644
--- a/src/lib/elementary/elm_spinner.eo
+++ b/src/lib/elementary/elm_spinner.eo
@@ -1,4 +1,4 @@
1class Elm.Spinner (Efl.Ui.Layout.Object, Efl.Ui.Range, Efl.Ui.Focus.Composition, 1class Elm.Spinner (Efl.Ui.Layout, Efl.Ui.Range, Efl.Ui.Focus.Composition,
2 Efl.Access.Value, Efl.Access.Widget.Action, Efl.Ui.Legacy) 2 Efl.Access.Value, Efl.Access.Widget.Action, Efl.Ui.Legacy)
3{ 3{
4 [[Elementary spinner class]] 4 [[Elementary spinner class]]
diff --git a/src/lib/elementary/elm_thumb.eo b/src/lib/elementary/elm_thumb.eo
index 3be7e43..674f2ec 100644
--- a/src/lib/elementary/elm_thumb.eo
+++ b/src/lib/elementary/elm_thumb.eo
@@ -1,4 +1,4 @@
1class Elm.Thumb (Efl.Ui.Layout.Object, Efl.File, Efl.Ui.Clickable, 1class Elm.Thumb (Efl.Ui.Layout, Efl.File, Efl.Ui.Clickable,
2 Efl.Ui.Draggable, Efl.Ui.Legacy) 2 Efl.Ui.Draggable, Efl.Ui.Legacy)
3{ 3{
4 [[Elementary thumbnail class]] 4 [[Elementary thumbnail class]]
diff --git a/src/lib/elementary/elm_widget_layout.h b/src/lib/elementary/elm_widget_layout.h
index 5b87179..a8e92d5 100644
--- a/src/lib/elementary/elm_widget_layout.h
+++ b/src/lib/elementary/elm_widget_layout.h
@@ -71,17 +71,17 @@ typedef struct _Elm_Layout_Smart_Data
71 Eina_Bool can_access : 1; /**< This is true when all text(including textblock) parts can be accessible by accessibility. */ 71 Eina_Bool can_access : 1; /**< This is true when all text(including textblock) parts can be accessible by accessibility. */
72 Eina_Bool destructed_is : 1; /**< This flag indicates if Efl.Ui.Layout destructor was called. This is needed to avoid unnecessary calculation of subobject deletion during layout object's deletion. */ 72 Eina_Bool destructed_is : 1; /**< This flag indicates if Efl.Ui.Layout destructor was called. This is needed to avoid unnecessary calculation of subobject deletion during layout object's deletion. */
73 Eina_Bool file_set : 1; /**< This flag indicates if Efl.Ui.Layout source is set from a file*/ 73 Eina_Bool file_set : 1; /**< This flag indicates if Efl.Ui.Layout source is set from a file*/
74} Efl_Ui_Layout_Object_Data; 74} Efl_Ui_Layout_Data;
75 75
76/** 76/**
77 * @} 77 * @}
78 */ 78 */
79 79
80#define EFL_UI_LAYOUT_DATA_GET(o, sd) \ 80#define EFL_UI_LAYOUT_DATA_GET(o, sd) \
81 Efl_Ui_Layout_Object_Data * sd = efl_data_scope_get(o, EFL_UI_LAYOUT_OBJECT_CLASS) 81 Efl_Ui_Layout_Data * sd = efl_data_scope_get(o, EFL_UI_LAYOUT_CLASS)
82 82
83#define EFL_UI_LAYOUT_CHECK(obj) \ 83#define EFL_UI_LAYOUT_CHECK(obj) \
84 if (EINA_UNLIKELY(!efl_isa(obj, EFL_UI_LAYOUT_OBJECT_CLASS))) \ 84 if (EINA_UNLIKELY(!efl_isa(obj, EFL_UI_LAYOUT_CLASS))) \
85 return 85 return
86 86
87#endif 87#endif
diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build
index 64071a5..9d308e1 100644
--- a/src/lib/elementary/meson.build
+++ b/src/lib/elementary/meson.build
@@ -142,7 +142,7 @@ pub_eo_files = [
142 'efl_ui_stack.eo', 142 'efl_ui_stack.eo',
143 'efl_ui_image.eo', 143 'efl_ui_image.eo',
144 'efl_ui_image_zoomable.eo', 144 'efl_ui_image_zoomable.eo',
145 'efl_ui_layout_object.eo', 145 'efl_ui_layout.eo',
146 'efl_ui_nstate.eo', 146 'efl_ui_nstate.eo',
147 'efl_ui_navigation_bar.eo', 147 'efl_ui_navigation_bar.eo',
148 'efl_ui_navigation_bar_part.eo', 148 'efl_ui_navigation_bar_part.eo',
@@ -771,7 +771,7 @@ elementary_src = [
771 'elm_interface_scrollable.c', 771 'elm_interface_scrollable.c',
772 'elm_inwin.c', 772 'elm_inwin.c',
773 'elm_label.c', 773 'elm_label.c',
774 'efl_ui_layout_object.c', 774 'efl_ui_layout.c',
775 'efl_ui_layout_pack.c', 775 'efl_ui_layout_pack.c',
776 'elm_list.c', 776 'elm_list.c',
777 'elm_main.c', 777 'elm_main.c',