summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-07-30 13:11:54 -0400
committerMike Blumenkrantz <zmike@samsung.com>2019-07-30 13:12:52 -0400
commit4d79efce64db8c9be8a79a299fbeb2ae97b60af2 (patch)
tree6ad3b81928b82bc95cf8d18a121c9363df309e74
parent7e517e2a1196207bbfe76ce9ab12be3093d9afc5 (diff)
elm_layout: create a mixin to provide elm_layout_sizing_eval
Summary: this removes elm_layout_sizing_eval entirely from the implementation hierarchy of any efl_ui-based widgets, ensuring that future code will correctly use efl_canvas_group functionality Depends on D9439 Reviewers: bu5hm4n Reviewed By: bu5hm4n Subscribers: bu5hm4n, cedric, #reviewers, #committers Tags: #efl_widgets Maniphest Tasks: T8059 Differential Revision: https://phab.enlightenment.org/D9440
-rw-r--r--src/lib/elementary/efl_ui_bg_legacy_eo.c2
-rw-r--r--src/lib/elementary/efl_ui_button_legacy_eo.c2
-rw-r--r--src/lib/elementary/efl_ui_check_legacy_eo.c2
-rw-r--r--src/lib/elementary/efl_ui_frame_legacy_eo.c2
-rw-r--r--src/lib/elementary/efl_ui_layout.c52
-rw-r--r--src/lib/elementary/efl_ui_layout_legacy_eo.c39
-rw-r--r--src/lib/elementary/efl_ui_layout_legacy_eo.h2
-rw-r--r--src/lib/elementary/efl_ui_panes_legacy_eo.c2
-rw-r--r--src/lib/elementary/efl_ui_progressbar_legacy_eo.c2
-rw-r--r--src/lib/elementary/efl_ui_radio_legacy_eo.c2
-rw-r--r--src/lib/elementary/efl_ui_textpath_legacy_eo.c2
-rw-r--r--src/lib/elementary/efl_ui_video_legacy_eo.c2
-rw-r--r--src/lib/elementary/efl_ui_win_legacy_eo.c2
-rw-r--r--src/lib/elementary/elm_actionslider_eo.c2
-rw-r--r--src/lib/elementary/elm_bubble_eo.c2
-rw-r--r--src/lib/elementary/elm_calendar_eo.c2
-rw-r--r--src/lib/elementary/elm_clock_eo.c2
-rw-r--r--src/lib/elementary/elm_code_widget_legacy_eo.c2
-rw-r--r--src/lib/elementary/elm_colorselector_eo.c2
-rw-r--r--src/lib/elementary/elm_conformant_eo.c2
-rw-r--r--src/lib/elementary/elm_ctxpopup_eo.c2
-rw-r--r--src/lib/elementary/elm_dayselector_eo.c2
-rw-r--r--src/lib/elementary/elm_entry_eo.c2
-rw-r--r--src/lib/elementary/elm_fileselector_button_eo.c2
-rw-r--r--src/lib/elementary/elm_fileselector_entry_eo.c2
-rw-r--r--src/lib/elementary/elm_fileselector_eo.c2
-rw-r--r--src/lib/elementary/elm_flipselector_eo.c2
-rw-r--r--src/lib/elementary/elm_gengrid_eo.c2
-rw-r--r--src/lib/elementary/elm_genlist_eo.c2
-rw-r--r--src/lib/elementary/elm_hover_eo.c2
-rw-r--r--src/lib/elementary/elm_hoversel_eo.c2
-rw-r--r--src/lib/elementary/elm_index_eo.c2
-rw-r--r--src/lib/elementary/elm_inwin_eo.c2
-rw-r--r--src/lib/elementary/elm_label_eo.c2
-rw-r--r--src/lib/elementary/elm_list_eo.c2
-rw-r--r--src/lib/elementary/elm_multibuttonentry_eo.c2
-rw-r--r--src/lib/elementary/elm_naviframe_eo.c2
-rw-r--r--src/lib/elementary/elm_panel_eo.c2
-rw-r--r--src/lib/elementary/elm_player_eo.c2
-rw-r--r--src/lib/elementary/elm_popup_eo.c2
-rw-r--r--src/lib/elementary/elm_priv.h1
-rw-r--r--src/lib/elementary/elm_route_eo.c2
-rw-r--r--src/lib/elementary/elm_scroller_eo.c2
-rw-r--r--src/lib/elementary/elm_segment_control_eo.c2
-rw-r--r--src/lib/elementary/elm_separator_eo.c2
-rw-r--r--src/lib/elementary/elm_slider_eo.c2
-rw-r--r--src/lib/elementary/elm_slideshow_eo.c2
-rw-r--r--src/lib/elementary/elm_spinner_eo.c2
-rw-r--r--src/lib/elementary/elm_thumb_eo.c2
-rw-r--r--src/lib/elementary/elm_widget_layout.h8
50 files changed, 126 insertions, 66 deletions
diff --git a/src/lib/elementary/efl_ui_bg_legacy_eo.c b/src/lib/elementary/efl_ui_bg_legacy_eo.c
index 9cd23ff42f..ea7bffcb8d 100644
--- a/src/lib/elementary/efl_ui_bg_legacy_eo.c
+++ b/src/lib/elementary/efl_ui_bg_legacy_eo.c
@@ -32,4 +32,4 @@ static const Efl_Class_Description _efl_ui_bg_legacy_class_desc = {
32 NULL 32 NULL
33}; 33};
34 34
35EFL_DEFINE_CLASS(efl_ui_bg_legacy_class_get, &_efl_ui_bg_legacy_class_desc, EFL_UI_BG_CLASS, EFL_UI_LEGACY_INTERFACE, NULL); 35EFL_DEFINE_CLASS(efl_ui_bg_legacy_class_get, &_efl_ui_bg_legacy_class_desc, EFL_UI_BG_CLASS, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
diff --git a/src/lib/elementary/efl_ui_button_legacy_eo.c b/src/lib/elementary/efl_ui_button_legacy_eo.c
index 0fcd13af64..81d3735872 100644
--- a/src/lib/elementary/efl_ui_button_legacy_eo.c
+++ b/src/lib/elementary/efl_ui_button_legacy_eo.c
@@ -44,4 +44,4 @@ static const Efl_Class_Description _efl_ui_button_legacy_class_desc = {
44 NULL 44 NULL
45}; 45};
46 46
47EFL_DEFINE_CLASS(efl_ui_button_legacy_class_get, &_efl_ui_button_legacy_class_desc, EFL_UI_BUTTON_CLASS, EFL_UI_LEGACY_INTERFACE, NULL); 47EFL_DEFINE_CLASS(efl_ui_button_legacy_class_get, &_efl_ui_button_legacy_class_desc, EFL_UI_BUTTON_CLASS, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
diff --git a/src/lib/elementary/efl_ui_check_legacy_eo.c b/src/lib/elementary/efl_ui_check_legacy_eo.c
index cd1d466ee9..591fc2783a 100644
--- a/src/lib/elementary/efl_ui_check_legacy_eo.c
+++ b/src/lib/elementary/efl_ui_check_legacy_eo.c
@@ -44,4 +44,4 @@ static const Efl_Class_Description _efl_ui_check_legacy_class_desc = {
44 NULL 44 NULL
45}; 45};
46 46
47EFL_DEFINE_CLASS(efl_ui_check_legacy_class_get, &_efl_ui_check_legacy_class_desc, EFL_UI_CHECK_CLASS, EFL_UI_LEGACY_INTERFACE, NULL); 47EFL_DEFINE_CLASS(efl_ui_check_legacy_class_get, &_efl_ui_check_legacy_class_desc, EFL_UI_CHECK_CLASS, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
diff --git a/src/lib/elementary/efl_ui_frame_legacy_eo.c b/src/lib/elementary/efl_ui_frame_legacy_eo.c
index 22e40576a2..ca10f87b8a 100644
--- a/src/lib/elementary/efl_ui_frame_legacy_eo.c
+++ b/src/lib/elementary/efl_ui_frame_legacy_eo.c
@@ -32,4 +32,4 @@ static const Efl_Class_Description _efl_ui_frame_legacy_class_desc = {
32 NULL 32 NULL
33}; 33};
34 34
35EFL_DEFINE_CLASS(efl_ui_frame_legacy_class_get, &_efl_ui_frame_legacy_class_desc, EFL_UI_FRAME_CLASS, EFL_UI_LEGACY_INTERFACE, NULL); 35EFL_DEFINE_CLASS(efl_ui_frame_legacy_class_get, &_efl_ui_frame_legacy_class_desc, EFL_UI_FRAME_CLASS, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
diff --git a/src/lib/elementary/efl_ui_layout.c b/src/lib/elementary/efl_ui_layout.c
index cde03e3213..9576c2bfc6 100644
--- a/src/lib/elementary/efl_ui_layout.c
+++ b/src/lib/elementary/efl_ui_layout.c
@@ -160,7 +160,7 @@ _part_cursor_free(Efl_Ui_Layout_Sub_Object_Cursor *pc)
160} 160}
161 161
162static void 162static void
163_sizing_eval(Evas_Object *obj, Efl_Ui_Layout_Data *sd) 163_sizing_eval(Evas_Object *obj, Efl_Ui_Layout_Data *sd, Elm_Layout_Data *ld)
164{ 164{
165 int minh = 0, minw = 0; 165 int minh = 0, minw = 0;
166 int rest_w = 0, rest_h = 0; 166 int rest_w = 0, rest_h = 0;
@@ -179,7 +179,7 @@ _sizing_eval(Evas_Object *obj, Efl_Ui_Layout_Data *sd)
179 } 179 }
180 elm_coords_finger_size_adjust(sd->finger_size_multiplier_x, &rest_w, 180 elm_coords_finger_size_adjust(sd->finger_size_multiplier_x, &rest_w,
181 sd->finger_size_multiplier_y, &rest_h); 181 sd->finger_size_multiplier_y, &rest_h);
182 if (elm_widget_is_legacy(obj)) 182 if (ld)
183 sz = efl_gfx_hint_size_combined_min_get(obj); 183 sz = efl_gfx_hint_size_combined_min_get(obj);
184 else 184 else
185 sz = efl_gfx_hint_size_min_get(obj); 185 sz = efl_gfx_hint_size_min_get(obj);
@@ -205,8 +205,13 @@ _sizing_eval(Evas_Object *obj, Efl_Ui_Layout_Data *sd)
205 if (sd->finger_size_multiplier_y) 205 if (sd->finger_size_multiplier_y)
206 elm_coords_finger_size_adjust(sd->finger_size_multiplier_x, NULL, 206 elm_coords_finger_size_adjust(sd->finger_size_multiplier_x, NULL,
207 sd->finger_size_multiplier_y, &minh); 207 sd->finger_size_multiplier_y, &minh);
208 evas_object_size_hint_min_set(obj, minw, minh); 208
209 efl_gfx_hint_size_restricted_min_set(obj, EINA_SIZE2D(minw, minh)); 209 efl_gfx_hint_size_restricted_min_set(obj, EINA_SIZE2D(minw, minh));
210
211 if (ld)
212 {
213 efl_gfx_hint_size_min_set(obj, EINA_SIZE2D(minw, minh));
214 }
210 sd->restricted_calc_w = sd->restricted_calc_h = EINA_FALSE; 215 sd->restricted_calc_w = sd->restricted_calc_h = EINA_FALSE;
211} 216}
212 217
@@ -879,11 +884,11 @@ _efl_ui_layout_efl_canvas_group_group_calculate(Eo *obj, void *_pd EINA_UNUSED)
879EOLIAN static void 884EOLIAN static void
880_efl_ui_layout_base_efl_canvas_group_group_calculate(Eo *obj, Efl_Ui_Layout_Data *sd) 885_efl_ui_layout_base_efl_canvas_group_group_calculate(Eo *obj, Efl_Ui_Layout_Data *sd)
881{ 886{
882 Eina_Bool legacy = elm_widget_is_legacy(obj); 887 Elm_Layout_Data *ld = efl_data_scope_safe_get(obj, ELM_LAYOUT_MIXIN);
883 efl_canvas_group_need_recalculate_set(obj, EINA_FALSE); 888 efl_canvas_group_need_recalculate_set(obj, EINA_FALSE);
884 if ((!legacy) || sd->needs_size_calc) 889 if ((!ld) || ld->needs_size_calc)
885 _sizing_eval(obj, sd); 890 _sizing_eval(obj, sd, ld);
886 sd->needs_size_calc = EINA_FALSE; 891 if (ld) ld->needs_size_calc = EINA_FALSE;
887} 892}
888 893
889EOLIAN static void 894EOLIAN static void
@@ -1781,19 +1786,26 @@ _efl_ui_layout_base_efl_layout_group_part_exist_get(const Eo *obj, Efl_Ui_Layout
1781 return efl_layout_group_part_exist_get(wd->resize_obj, part); 1786 return efl_layout_group_part_exist_get(wd->resize_obj, part);
1782} 1787}
1783 1788
1789EOLIAN static void
1790_elm_layout_efl_canvas_group_change(Eo *obj, Elm_Layout_Data *ld)
1791{
1792 Efl_Ui_Layout_Data *sd;
1793
1794 if (!efl_finalized_get(obj)) return;
1795 sd = efl_data_scope_safe_get(obj, EFL_UI_LAYOUT_BASE_CLASS);
1796 if (sd->frozen) return;
1797 ld->needs_size_calc = EINA_TRUE;
1798 efl_canvas_group_change(efl_super(obj, ELM_LAYOUT_MIXIN));
1799}
1800
1784/* layout's sizing evaluation is deferred. evaluation requests are 1801/* layout's sizing evaluation is deferred. evaluation requests are
1785 * queued up and only flag the object as 'changed'. when it comes to 1802 * queued up and only flag the object as 'changed'. when it comes to
1786 * Evas's rendering phase, it will be addressed, finally (see 1803 * Evas's rendering phase, it will be addressed, finally (see
1787 * _efl_ui_layout_smart_calculate()). */ 1804 * _efl_ui_layout_smart_calculate()). */
1788static void 1805EOLIAN static void
1789_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Layout_Data *sd) 1806_elm_layout_sizing_eval(Eo *obj, Elm_Layout_Data *ld)
1790{ 1807{
1791 if (!efl_finalized_get(obj)) return; 1808 _elm_layout_efl_canvas_group_change(obj, ld);
1792 if (sd->frozen) return;
1793 if (sd->needs_size_calc) return;
1794 sd->needs_size_calc = EINA_TRUE;
1795
1796 evas_object_smart_changed(obj);
1797} 1809}
1798 1810
1799EAPI void 1811EAPI void
@@ -2538,6 +2550,13 @@ _efl_ui_layout_base_efl_object_finalize(Eo *obj, Efl_Ui_Layout_Data *pd EINA_UNU
2538 efl_ui_widget_theme_apply(eo); 2550 efl_ui_widget_theme_apply(eo);
2539 efl_canvas_group_change(obj); 2551 efl_canvas_group_change(obj);
2540 2552
2553 Elm_Layout_Data *ld = efl_data_scope_safe_get(obj, ELM_LAYOUT_MIXIN);
2554 /* need to explicitly set this here to permit group_calc since efl_canvas_group_change
2555 * blocks non-finalized objects and the object will not be finalized until after this
2556 * function returns
2557 */
2558 if (ld) ld->needs_size_calc = EINA_TRUE;
2559
2541 win = elm_widget_top_get(obj); 2560 win = elm_widget_top_get(obj);
2542 if (efl_isa(win, EFL_UI_WIN_CLASS)) 2561 if (efl_isa(win, EFL_UI_WIN_CLASS))
2543 efl_ui_layout_theme_rotation_apply(obj, efl_ui_win_rotation_get(win)); 2562 efl_ui_layout_theme_rotation_apply(obj, efl_ui_win_rotation_get(win));
@@ -2788,7 +2807,6 @@ _efl_ui_layout_base_theme_rotation_apply(Eo *obj, Efl_Ui_Layout_Data *pd EINA_UN
2788 2807
2789/* Internal EO APIs and hidden overrides */ 2808/* Internal EO APIs and hidden overrides */
2790 2809
2791EAPI EFL_VOID_FUNC_BODY(elm_layout_sizing_eval)
2792EFL_FUNC_BODY_CONST(elm_layout_text_aliases_get, const Elm_Layout_Part_Alias_Description *, NULL) 2810EFL_FUNC_BODY_CONST(elm_layout_text_aliases_get, const Elm_Layout_Part_Alias_Description *, NULL)
2793EFL_FUNC_BODY_CONST(elm_layout_content_aliases_get, const Elm_Layout_Part_Alias_Description *, NULL) 2811EFL_FUNC_BODY_CONST(elm_layout_content_aliases_get, const Elm_Layout_Part_Alias_Description *, NULL)
2794 2812
@@ -2801,9 +2819,9 @@ ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
2801 ELM_PART_TEXT_DEFAULT_OPS(efl_ui_layout_base), \ 2819 ELM_PART_TEXT_DEFAULT_OPS(efl_ui_layout_base), \
2802 ELM_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX), \ 2820 ELM_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX), \
2803 ELM_LAYOUT_TEXT_ALIASES_OPS(MY_CLASS_PFX), \ 2821 ELM_LAYOUT_TEXT_ALIASES_OPS(MY_CLASS_PFX), \
2804 EFL_OBJECT_OP_FUNC(elm_layout_sizing_eval, _elm_layout_sizing_eval), \
2805 EFL_OBJECT_OP_FUNC(efl_dbg_info_get, _efl_ui_layout_base_efl_object_dbg_info_get) 2822 EFL_OBJECT_OP_FUNC(efl_dbg_info_get, _efl_ui_layout_base_efl_object_dbg_info_get)
2806 2823
2824
2807#include "efl_ui_layout_base.eo.c" 2825#include "efl_ui_layout_base.eo.c"
2808#include "efl_ui_layout.eo.c" 2826#include "efl_ui_layout.eo.c"
2809 2827
diff --git a/src/lib/elementary/efl_ui_layout_legacy_eo.c b/src/lib/elementary/efl_ui_layout_legacy_eo.c
index 6bec4f9f78..33056b5c03 100644
--- a/src/lib/elementary/efl_ui_layout_legacy_eo.c
+++ b/src/lib/elementary/efl_ui_layout_legacy_eo.c
@@ -1,7 +1,6 @@
1 1
2Efl_Object *_efl_ui_layout_legacy_efl_object_constructor(Eo *obj, void *pd); 2Efl_Object *_efl_ui_layout_legacy_efl_object_constructor(Eo *obj, void *pd);
3 3
4
5static Eina_Bool 4static Eina_Bool
6_efl_ui_layout_legacy_class_initializer(Efl_Class *klass) 5_efl_ui_layout_legacy_class_initializer(Efl_Class *klass)
7{ 6{
@@ -32,4 +31,40 @@ static const Efl_Class_Description _efl_ui_layout_legacy_class_desc = {
32 NULL 31 NULL
33}; 32};
34 33
35EFL_DEFINE_CLASS(efl_ui_layout_legacy_class_get, &_efl_ui_layout_legacy_class_desc, EFL_UI_LAYOUT_CLASS, EFL_UI_LEGACY_INTERFACE, NULL); 34EFL_DEFINE_CLASS(efl_ui_layout_legacy_class_get, &_efl_ui_layout_legacy_class_desc, EFL_UI_LAYOUT_CLASS, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
35
36static void _elm_layout_sizing_eval(Eo *obj, Elm_Layout_Data *ld);
37EAPI EFL_VOID_FUNC_BODY(elm_layout_sizing_eval);
38
39static Eina_Bool
40_elm_layout_class_initializer(Efl_Class *klass)
41{
42 const Efl_Object_Ops *opsp = NULL;
43
44 const Efl_Object_Property_Reflection_Ops *ropsp = NULL;
45
46#ifndef ELM_LAYOUT_EXTRA_OPS
47#define ELM_LAYOUT_EXTRA_OPS
48#endif
49
50 EFL_OPS_DEFINE(ops,
51 EFL_OBJECT_OP_FUNC(elm_layout_sizing_eval, _elm_layout_sizing_eval),
52 EFL_OBJECT_OP_FUNC(efl_canvas_group_change, _elm_layout_efl_canvas_group_change),
53 ELM_LAYOUT_EXTRA_OPS
54 );
55 opsp = &ops;
56
57 return efl_class_functions_set(klass, opsp, ropsp);
58}
59
60static const Efl_Class_Description _elm_layout_class_desc = {
61 EO_VERSION,
62 "Elm.Layout",
63 EFL_CLASS_TYPE_MIXIN,
64 sizeof(Elm_Layout_Data),
65 _elm_layout_class_initializer,
66 NULL,
67 NULL
68};
69
70EFL_DEFINE_CLASS(elm_layout_mixin_get, &_elm_layout_class_desc, NULL, NULL);
diff --git a/src/lib/elementary/efl_ui_layout_legacy_eo.h b/src/lib/elementary/efl_ui_layout_legacy_eo.h
index 3ad5c08573..687bd590c5 100644
--- a/src/lib/elementary/efl_ui_layout_legacy_eo.h
+++ b/src/lib/elementary/efl_ui_layout_legacy_eo.h
@@ -19,8 +19,10 @@ typedef Eo Efl_Ui_Layout_Legacy;
19 * @ingroup Efl_Ui_Layout_Legacy 19 * @ingroup Efl_Ui_Layout_Legacy
20 */ 20 */
21#define EFL_UI_LAYOUT_LEGACY_CLASS efl_ui_layout_legacy_class_get() 21#define EFL_UI_LAYOUT_LEGACY_CLASS efl_ui_layout_legacy_class_get()
22#define ELM_LAYOUT_MIXIN elm_layout_mixin_get()
22 23
23EWAPI const Efl_Class *efl_ui_layout_legacy_class_get(void); 24EWAPI const Efl_Class *efl_ui_layout_legacy_class_get(void);
25EWAPI const Efl_Class *elm_layout_mixin_get(void);
24#endif /* EFL_BETA_API_SUPPORT */ 26#endif /* EFL_BETA_API_SUPPORT */
25 27
26#endif 28#endif
diff --git a/src/lib/elementary/efl_ui_panes_legacy_eo.c b/src/lib/elementary/efl_ui_panes_legacy_eo.c
index ba95585085..b4fd1a8844 100644
--- a/src/lib/elementary/efl_ui_panes_legacy_eo.c
+++ b/src/lib/elementary/efl_ui_panes_legacy_eo.c
@@ -32,4 +32,4 @@ static const Efl_Class_Description _efl_ui_panes_legacy_class_desc = {
32 NULL 32 NULL
33}; 33};
34 34
35EFL_DEFINE_CLASS(efl_ui_panes_legacy_class_get, &_efl_ui_panes_legacy_class_desc, EFL_UI_PANES_CLASS, EFL_UI_LEGACY_INTERFACE, NULL); 35EFL_DEFINE_CLASS(efl_ui_panes_legacy_class_get, &_efl_ui_panes_legacy_class_desc, EFL_UI_PANES_CLASS, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
diff --git a/src/lib/elementary/efl_ui_progressbar_legacy_eo.c b/src/lib/elementary/efl_ui_progressbar_legacy_eo.c
index 8b32d45cd1..46c8bb5753 100644
--- a/src/lib/elementary/efl_ui_progressbar_legacy_eo.c
+++ b/src/lib/elementary/efl_ui_progressbar_legacy_eo.c
@@ -44,4 +44,4 @@ static const Efl_Class_Description _efl_ui_progressbar_legacy_class_desc = {
44 NULL 44 NULL
45}; 45};
46 46
47EFL_DEFINE_CLASS(efl_ui_progressbar_legacy_class_get, &_efl_ui_progressbar_legacy_class_desc, EFL_UI_PROGRESSBAR_CLASS, EFL_UI_LEGACY_INTERFACE, NULL); 47EFL_DEFINE_CLASS(efl_ui_progressbar_legacy_class_get, &_efl_ui_progressbar_legacy_class_desc, EFL_UI_PROGRESSBAR_CLASS, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
diff --git a/src/lib/elementary/efl_ui_radio_legacy_eo.c b/src/lib/elementary/efl_ui_radio_legacy_eo.c
index b0a26730e8..453fbc29ff 100644
--- a/src/lib/elementary/efl_ui_radio_legacy_eo.c
+++ b/src/lib/elementary/efl_ui_radio_legacy_eo.c
@@ -44,4 +44,4 @@ static const Efl_Class_Description _efl_ui_radio_legacy_class_desc = {
44 NULL 44 NULL
45}; 45};
46 46
47EFL_DEFINE_CLASS(efl_ui_radio_legacy_class_get, &_efl_ui_radio_legacy_class_desc, EFL_UI_RADIO_CLASS, EFL_UI_LEGACY_INTERFACE, NULL); 47EFL_DEFINE_CLASS(efl_ui_radio_legacy_class_get, &_efl_ui_radio_legacy_class_desc, EFL_UI_RADIO_CLASS, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
diff --git a/src/lib/elementary/efl_ui_textpath_legacy_eo.c b/src/lib/elementary/efl_ui_textpath_legacy_eo.c
index 401a626321..c60d031b6a 100644
--- a/src/lib/elementary/efl_ui_textpath_legacy_eo.c
+++ b/src/lib/elementary/efl_ui_textpath_legacy_eo.c
@@ -32,4 +32,4 @@ static const Efl_Class_Description _efl_ui_textpath_legacy_class_desc = {
32 NULL 32 NULL
33}; 33};
34 34
35EFL_DEFINE_CLASS(efl_ui_textpath_legacy_class_get, &_efl_ui_textpath_legacy_class_desc, EFL_UI_TEXTPATH_CLASS, EFL_UI_LEGACY_INTERFACE, NULL); 35EFL_DEFINE_CLASS(efl_ui_textpath_legacy_class_get, &_efl_ui_textpath_legacy_class_desc, EFL_UI_TEXTPATH_CLASS, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
diff --git a/src/lib/elementary/efl_ui_video_legacy_eo.c b/src/lib/elementary/efl_ui_video_legacy_eo.c
index 1c49e44ca4..462d3679b4 100644
--- a/src/lib/elementary/efl_ui_video_legacy_eo.c
+++ b/src/lib/elementary/efl_ui_video_legacy_eo.c
@@ -32,4 +32,4 @@ static const Efl_Class_Description _efl_ui_video_legacy_class_desc = {
32 NULL 32 NULL
33}; 33};
34 34
35EFL_DEFINE_CLASS(efl_ui_video_legacy_class_get, &_efl_ui_video_legacy_class_desc, EFL_UI_VIDEO_CLASS, EFL_UI_LEGACY_INTERFACE, NULL); 35EFL_DEFINE_CLASS(efl_ui_video_legacy_class_get, &_efl_ui_video_legacy_class_desc, EFL_UI_VIDEO_CLASS, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
diff --git a/src/lib/elementary/efl_ui_win_legacy_eo.c b/src/lib/elementary/efl_ui_win_legacy_eo.c
index 8be8c6892b..79f3e7ea3f 100644
--- a/src/lib/elementary/efl_ui_win_legacy_eo.c
+++ b/src/lib/elementary/efl_ui_win_legacy_eo.c
@@ -32,4 +32,4 @@ static const Efl_Class_Description _efl_ui_win_legacy_class_desc = {
32 NULL 32 NULL
33}; 33};
34 34
35EFL_DEFINE_CLASS(efl_ui_win_legacy_class_get, &_efl_ui_win_legacy_class_desc, EFL_UI_WIN_CLASS, EFL_UI_LEGACY_INTERFACE, NULL); 35EFL_DEFINE_CLASS(efl_ui_win_legacy_class_get, &_efl_ui_win_legacy_class_desc, EFL_UI_WIN_CLASS, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
diff --git a/src/lib/elementary/elm_actionslider_eo.c b/src/lib/elementary/elm_actionslider_eo.c
index 5e47bd42f6..20cd7aa6e2 100644
--- a/src/lib/elementary/elm_actionslider_eo.c
+++ b/src/lib/elementary/elm_actionslider_eo.c
@@ -77,6 +77,6 @@ static const Efl_Class_Description _elm_actionslider_class_desc = {
77 NULL 77 NULL
78}; 78};
79 79
80EFL_DEFINE_CLASS(elm_actionslider_class_get, &_elm_actionslider_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_UI_SELECTABLE_INTERFACE, EFL_UI_LEGACY_INTERFACE, NULL); 80EFL_DEFINE_CLASS(elm_actionslider_class_get, &_elm_actionslider_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_UI_SELECTABLE_INTERFACE, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
81 81
82#include "elm_actionslider_eo.legacy.c" 82#include "elm_actionslider_eo.legacy.c"
diff --git a/src/lib/elementary/elm_bubble_eo.c b/src/lib/elementary/elm_bubble_eo.c
index 24780aacf0..284bfb9ff6 100644
--- a/src/lib/elementary/elm_bubble_eo.c
+++ b/src/lib/elementary/elm_bubble_eo.c
@@ -50,6 +50,6 @@ static const Efl_Class_Description _elm_bubble_class_desc = {
50 NULL 50 NULL
51}; 51};
52 52
53EFL_DEFINE_CLASS(elm_bubble_class_get, &_elm_bubble_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_INPUT_CLICKABLE_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL); 53EFL_DEFINE_CLASS(elm_bubble_class_get, &_elm_bubble_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_INPUT_CLICKABLE_MIXIN, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
54 54
55#include "elm_bubble_eo.legacy.c" 55#include "elm_bubble_eo.legacy.c"
diff --git a/src/lib/elementary/elm_calendar_eo.c b/src/lib/elementary/elm_calendar_eo.c
index 2bb920f78f..eebca52f43 100644
--- a/src/lib/elementary/elm_calendar_eo.c
+++ b/src/lib/elementary/elm_calendar_eo.c
@@ -207,6 +207,6 @@ static const Efl_Class_Description _elm_calendar_class_desc = {
207 NULL 207 NULL
208}; 208};
209 209
210EFL_DEFINE_CLASS(elm_calendar_class_get, &_elm_calendar_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_UI_FOCUS_COMPOSITION_MIXIN, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL); 210EFL_DEFINE_CLASS(elm_calendar_class_get, &_elm_calendar_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_UI_FOCUS_COMPOSITION_MIXIN, EFL_ACCESS_WIDGET_ACTION_MIXIN, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
211 211
212#include "elm_calendar_eo.legacy.c" 212#include "elm_calendar_eo.legacy.c"
diff --git a/src/lib/elementary/elm_clock_eo.c b/src/lib/elementary/elm_clock_eo.c
index b5bfc9f099..a8512e2200 100644
--- a/src/lib/elementary/elm_clock_eo.c
+++ b/src/lib/elementary/elm_clock_eo.c
@@ -244,6 +244,6 @@ static const Efl_Class_Description _elm_clock_class_desc = {
244 NULL 244 NULL
245}; 245};
246 246
247EFL_DEFINE_CLASS(elm_clock_class_get, &_elm_clock_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_UI_FOCUS_COMPOSITION_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL); 247EFL_DEFINE_CLASS(elm_clock_class_get, &_elm_clock_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_UI_FOCUS_COMPOSITION_MIXIN, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
248 248
249#include "elm_clock_eo.legacy.c" 249#include "elm_clock_eo.legacy.c"
diff --git a/src/lib/elementary/elm_code_widget_legacy_eo.c b/src/lib/elementary/elm_code_widget_legacy_eo.c
index e16bdd1cc3..e239bf327f 100644
--- a/src/lib/elementary/elm_code_widget_legacy_eo.c
+++ b/src/lib/elementary/elm_code_widget_legacy_eo.c
@@ -24,4 +24,4 @@ static const Efl_Class_Description _elm_code_widget_legacy_class_desc = {
24 NULL 24 NULL
25}; 25};
26 26
27EFL_DEFINE_CLASS(elm_code_widget_legacy_class_get, &_elm_code_widget_legacy_class_desc, ELM_CODE_WIDGET_CLASS, EFL_UI_LEGACY_INTERFACE, NULL); 27EFL_DEFINE_CLASS(elm_code_widget_legacy_class_get, &_elm_code_widget_legacy_class_desc, ELM_CODE_WIDGET_CLASS, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
diff --git a/src/lib/elementary/elm_colorselector_eo.c b/src/lib/elementary/elm_colorselector_eo.c
index c7ce07fc82..7ccbde22d7 100644
--- a/src/lib/elementary/elm_colorselector_eo.c
+++ b/src/lib/elementary/elm_colorselector_eo.c
@@ -146,6 +146,6 @@ static const Efl_Class_Description _elm_colorselector_class_desc = {
146 NULL 146 NULL
147}; 147};
148 148
149EFL_DEFINE_CLASS(elm_colorselector_class_get, &_elm_colorselector_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_UI_FOCUS_COMPOSITION_MIXIN, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_INPUT_CLICKABLE_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL); 149EFL_DEFINE_CLASS(elm_colorselector_class_get, &_elm_colorselector_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_UI_FOCUS_COMPOSITION_MIXIN, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_INPUT_CLICKABLE_MIXIN, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
150 150
151#include "elm_colorselector_eo.legacy.c" 151#include "elm_colorselector_eo.legacy.c"
diff --git a/src/lib/elementary/elm_conformant_eo.c b/src/lib/elementary/elm_conformant_eo.c
index 379426c52f..deebeee4de 100644
--- a/src/lib/elementary/elm_conformant_eo.c
+++ b/src/lib/elementary/elm_conformant_eo.c
@@ -44,4 +44,4 @@ static const Efl_Class_Description _elm_conformant_class_desc = {
44 NULL 44 NULL
45}; 45};
46 46
47EFL_DEFINE_CLASS(elm_conformant_class_get, &_elm_conformant_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_UI_LEGACY_INTERFACE, NULL); 47EFL_DEFINE_CLASS(elm_conformant_class_get, &_elm_conformant_class_desc, EFL_UI_LAYOUT_BASE_CLASS, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
diff --git a/src/lib/elementary/elm_ctxpopup_eo.c b/src/lib/elementary/elm_ctxpopup_eo.c
index ebd83c53fb..fbe2f54805 100644
--- a/src/lib/elementary/elm_ctxpopup_eo.c
+++ b/src/lib/elementary/elm_ctxpopup_eo.c
@@ -220,6 +220,6 @@ static const Efl_Class_Description _elm_ctxpopup_class_desc = {
220 NULL 220 NULL
221}; 221};
222 222
223EFL_DEFINE_CLASS(elm_ctxpopup_class_get, &_elm_ctxpopup_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_UI_FOCUS_LAYER_MIXIN, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_UI_LEGACY_INTERFACE, ELM_WIDGET_ITEM_CONTAINER_INTERFACE, NULL); 223EFL_DEFINE_CLASS(elm_ctxpopup_class_get, &_elm_ctxpopup_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_UI_FOCUS_LAYER_MIXIN, EFL_ACCESS_WIDGET_ACTION_MIXIN, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, ELM_WIDGET_ITEM_CONTAINER_INTERFACE, NULL);
224 224
225#include "elm_ctxpopup_eo.legacy.c" 225#include "elm_ctxpopup_eo.legacy.c"
diff --git a/src/lib/elementary/elm_dayselector_eo.c b/src/lib/elementary/elm_dayselector_eo.c
index 83b478502f..acffe74ec2 100644
--- a/src/lib/elementary/elm_dayselector_eo.c
+++ b/src/lib/elementary/elm_dayselector_eo.c
@@ -126,6 +126,6 @@ static const Efl_Class_Description _elm_dayselector_class_desc = {
126 NULL 126 NULL
127}; 127};
128 128
129EFL_DEFINE_CLASS(elm_dayselector_class_get, &_elm_dayselector_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_UI_LEGACY_INTERFACE, NULL); 129EFL_DEFINE_CLASS(elm_dayselector_class_get, &_elm_dayselector_class_desc, EFL_UI_LAYOUT_BASE_CLASS, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
130 130
131#include "elm_dayselector_eo.legacy.c" 131#include "elm_dayselector_eo.legacy.c"
diff --git a/src/lib/elementary/elm_entry_eo.c b/src/lib/elementary/elm_entry_eo.c
index 397a6b4ea7..21c9c34eb9 100644
--- a/src/lib/elementary/elm_entry_eo.c
+++ b/src/lib/elementary/elm_entry_eo.c
@@ -1188,6 +1188,6 @@ static const Efl_Class_Description _elm_entry_class_desc = {
1188 NULL 1188 NULL
1189}; 1189};
1190 1190
1191EFL_DEFINE_CLASS(elm_entry_class_get, &_elm_entry_class_desc, EFL_UI_LAYOUT_BASE_CLASS, ELM_INTERFACE_SCROLLABLE_MIXIN, EFL_INPUT_CLICKABLE_MIXIN, EFL_ACCESS_TEXT_INTERFACE, EFL_ACCESS_EDITABLE_TEXT_INTERFACE, EFL_FILE_MIXIN, EFL_UI_SELECTABLE_INTERFACE, EFL_UI_SCROLLABLE_INTERFACE, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL); 1191EFL_DEFINE_CLASS(elm_entry_class_get, &_elm_entry_class_desc, EFL_UI_LAYOUT_BASE_CLASS, ELM_INTERFACE_SCROLLABLE_MIXIN, EFL_INPUT_CLICKABLE_MIXIN, EFL_ACCESS_TEXT_INTERFACE, EFL_ACCESS_EDITABLE_TEXT_INTERFACE, EFL_FILE_MIXIN, EFL_UI_SELECTABLE_INTERFACE, EFL_UI_SCROLLABLE_INTERFACE, EFL_ACCESS_WIDGET_ACTION_MIXIN, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
1192 1192
1193#include "elm_entry_eo.legacy.c" 1193#include "elm_entry_eo.legacy.c"
diff --git a/src/lib/elementary/elm_fileselector_button_eo.c b/src/lib/elementary/elm_fileselector_button_eo.c
index 7857efe04e..fb40341af3 100644
--- a/src/lib/elementary/elm_fileselector_button_eo.c
+++ b/src/lib/elementary/elm_fileselector_button_eo.c
@@ -146,4 +146,4 @@ static const Efl_Class_Description _elm_fileselector_button_class_desc = {
146 NULL 146 NULL
147}; 147};
148 148
149EFL_DEFINE_CLASS(elm_fileselector_button_class_get, &_elm_fileselector_button_class_desc, EFL_UI_BUTTON_CLASS, ELM_INTERFACE_FILESELECTOR_INTERFACE, EFL_UI_LEGACY_INTERFACE, NULL); 149EFL_DEFINE_CLASS(elm_fileselector_button_class_get, &_elm_fileselector_button_class_desc, EFL_UI_BUTTON_CLASS, ELM_INTERFACE_FILESELECTOR_INTERFACE, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
diff --git a/src/lib/elementary/elm_fileselector_entry_eo.c b/src/lib/elementary/elm_fileselector_entry_eo.c
index 3f6e17a701..90ee427d85 100644
--- a/src/lib/elementary/elm_fileselector_entry_eo.c
+++ b/src/lib/elementary/elm_fileselector_entry_eo.c
@@ -88,4 +88,4 @@ static const Efl_Class_Description _elm_fileselector_entry_class_desc = {
88 NULL 88 NULL
89}; 89};
90 90
91EFL_DEFINE_CLASS(elm_fileselector_entry_class_get, &_elm_fileselector_entry_class_desc, EFL_UI_LAYOUT_BASE_CLASS, ELM_INTERFACE_FILESELECTOR_INTERFACE, EFL_INPUT_CLICKABLE_MIXIN, EFL_UI_SELECTABLE_INTERFACE, EFL_UI_LEGACY_INTERFACE, NULL); 91EFL_DEFINE_CLASS(elm_fileselector_entry_class_get, &_elm_fileselector_entry_class_desc, EFL_UI_LAYOUT_BASE_CLASS, ELM_INTERFACE_FILESELECTOR_INTERFACE, EFL_INPUT_CLICKABLE_MIXIN, EFL_UI_SELECTABLE_INTERFACE, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
diff --git a/src/lib/elementary/elm_fileselector_eo.c b/src/lib/elementary/elm_fileselector_eo.c
index e6b7d726f4..eb74bb1ebd 100644
--- a/src/lib/elementary/elm_fileselector_eo.c
+++ b/src/lib/elementary/elm_fileselector_eo.c
@@ -202,6 +202,6 @@ static const Efl_Class_Description _elm_fileselector_class_desc = {
202 _elm_fileselector_class_destructor 202 _elm_fileselector_class_destructor
203}; 203};
204 204
205EFL_DEFINE_CLASS(elm_fileselector_class_get, &_elm_fileselector_class_desc, EFL_UI_LAYOUT_BASE_CLASS, ELM_INTERFACE_FILESELECTOR_INTERFACE, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_UI_FOCUS_COMPOSITION_MIXIN, EFL_INPUT_CLICKABLE_MIXIN, EFL_UI_SELECTABLE_INTERFACE, EFL_UI_LEGACY_INTERFACE, NULL); 205EFL_DEFINE_CLASS(elm_fileselector_class_get, &_elm_fileselector_class_desc, EFL_UI_LAYOUT_BASE_CLASS, ELM_INTERFACE_FILESELECTOR_INTERFACE, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_UI_FOCUS_COMPOSITION_MIXIN, EFL_INPUT_CLICKABLE_MIXIN, EFL_UI_SELECTABLE_INTERFACE, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
206 206
207#include "elm_fileselector_eo.legacy.c" 207#include "elm_fileselector_eo.legacy.c"
diff --git a/src/lib/elementary/elm_flipselector_eo.c b/src/lib/elementary/elm_flipselector_eo.c
index 3ad73d3a17..c0f01bbd22 100644
--- a/src/lib/elementary/elm_flipselector_eo.c
+++ b/src/lib/elementary/elm_flipselector_eo.c
@@ -154,6 +154,6 @@ static const Efl_Class_Description _elm_flipselector_class_desc = {
154 NULL 154 NULL
155}; 155};
156 156
157EFL_DEFINE_CLASS(elm_flipselector_class_get, &_elm_flipselector_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_UI_RANGE_INTERACTIVE_INTERFACE, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_UI_SELECTABLE_INTERFACE, EFL_UI_LEGACY_INTERFACE, NULL); 157EFL_DEFINE_CLASS(elm_flipselector_class_get, &_elm_flipselector_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_UI_RANGE_INTERACTIVE_INTERFACE, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_UI_SELECTABLE_INTERFACE, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
158 158
159#include "elm_flipselector_eo.legacy.c" 159#include "elm_flipselector_eo.legacy.c"
diff --git a/src/lib/elementary/elm_gengrid_eo.c b/src/lib/elementary/elm_gengrid_eo.c
index d927aae949..fd16690cc2 100644
--- a/src/lib/elementary/elm_gengrid_eo.c
+++ b/src/lib/elementary/elm_gengrid_eo.c
@@ -512,6 +512,6 @@ static const Efl_Class_Description _elm_gengrid_class_desc = {
512 NULL 512 NULL
513}; 513};
514 514
515EFL_DEFINE_CLASS(elm_gengrid_class_get, &_elm_gengrid_class_desc, EFL_UI_LAYOUT_BASE_CLASS, ELM_INTERFACE_SCROLLABLE_MIXIN, EFL_INPUT_CLICKABLE_MIXIN, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_ACCESS_SELECTION_INTERFACE, EFL_UI_LEGACY_INTERFACE, ELM_WIDGET_ITEM_CONTAINER_INTERFACE, NULL); 515EFL_DEFINE_CLASS(elm_gengrid_class_get, &_elm_gengrid_class_desc, EFL_UI_LAYOUT_BASE_CLASS, ELM_INTERFACE_SCROLLABLE_MIXIN, EFL_INPUT_CLICKABLE_MIXIN, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_ACCESS_SELECTION_INTERFACE, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, ELM_WIDGET_ITEM_CONTAINER_INTERFACE, NULL);
516 516
517#include "elm_gengrid_eo.legacy.c" 517#include "elm_gengrid_eo.legacy.c"
diff --git a/src/lib/elementary/elm_genlist_eo.c b/src/lib/elementary/elm_genlist_eo.c
index b34ec2a352..6ee35fbc2f 100644
--- a/src/lib/elementary/elm_genlist_eo.c
+++ b/src/lib/elementary/elm_genlist_eo.c
@@ -681,6 +681,6 @@ static const Efl_Class_Description _elm_genlist_class_desc = {
681 NULL 681 NULL
682}; 682};
683 683
684EFL_DEFINE_CLASS(elm_genlist_class_get, &_elm_genlist_class_desc, EFL_UI_LAYOUT_BASE_CLASS, ELM_INTERFACE_SCROLLABLE_MIXIN, EFL_INPUT_CLICKABLE_MIXIN, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_ACCESS_SELECTION_INTERFACE, EFL_UI_SELECTABLE_INTERFACE, EFL_UI_LEGACY_INTERFACE, ELM_WIDGET_ITEM_CONTAINER_INTERFACE, NULL); 684EFL_DEFINE_CLASS(elm_genlist_class_get, &_elm_genlist_class_desc, EFL_UI_LAYOUT_BASE_CLASS, ELM_INTERFACE_SCROLLABLE_MIXIN, EFL_INPUT_CLICKABLE_MIXIN, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_ACCESS_SELECTION_INTERFACE, EFL_UI_SELECTABLE_INTERFACE, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, ELM_WIDGET_ITEM_CONTAINER_INTERFACE, NULL);
685 685
686#include "elm_genlist_eo.legacy.c" 686#include "elm_genlist_eo.legacy.c"
diff --git a/src/lib/elementary/elm_hover_eo.c b/src/lib/elementary/elm_hover_eo.c
index c36c6ccf3f..cc72d79823 100644
--- a/src/lib/elementary/elm_hover_eo.c
+++ b/src/lib/elementary/elm_hover_eo.c
@@ -92,6 +92,6 @@ static const Efl_Class_Description _elm_hover_class_desc = {
92 NULL 92 NULL
93}; 93};
94 94
95EFL_DEFINE_CLASS(elm_hover_class_get, &_elm_hover_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_UI_FOCUS_LAYER_MIXIN, EFL_INPUT_CLICKABLE_MIXIN, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL); 95EFL_DEFINE_CLASS(elm_hover_class_get, &_elm_hover_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_UI_FOCUS_LAYER_MIXIN, EFL_INPUT_CLICKABLE_MIXIN, EFL_ACCESS_WIDGET_ACTION_MIXIN, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
96 96
97#include "elm_hover_eo.legacy.c" 97#include "elm_hover_eo.legacy.c"
diff --git a/src/lib/elementary/elm_hoversel_eo.c b/src/lib/elementary/elm_hoversel_eo.c
index 52bb001c67..676243e98d 100644
--- a/src/lib/elementary/elm_hoversel_eo.c
+++ b/src/lib/elementary/elm_hoversel_eo.c
@@ -189,6 +189,6 @@ static const Efl_Class_Description _elm_hoversel_class_desc = {
189 NULL 189 NULL
190}; 190};
191 191
192EFL_DEFINE_CLASS(elm_hoversel_class_get, &_elm_hoversel_class_desc, EFL_UI_BUTTON_LEGACY_CLASS, EFL_UI_SELECTABLE_INTERFACE, EFL_INPUT_CLICKABLE_MIXIN, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL); 192EFL_DEFINE_CLASS(elm_hoversel_class_get, &_elm_hoversel_class_desc, EFL_UI_BUTTON_LEGACY_CLASS, EFL_UI_SELECTABLE_INTERFACE, EFL_INPUT_CLICKABLE_MIXIN, EFL_ACCESS_WIDGET_ACTION_MIXIN, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
193 193
194#include "elm_hoversel_eo.legacy.c" 194#include "elm_hoversel_eo.legacy.c"
diff --git a/src/lib/elementary/elm_index_eo.c b/src/lib/elementary/elm_index_eo.c
index 806f94ce0b..32f46afb01 100644
--- a/src/lib/elementary/elm_index_eo.c
+++ b/src/lib/elementary/elm_index_eo.c
@@ -322,6 +322,6 @@ static const Efl_Class_Description _elm_index_class_desc = {
322 NULL 322 NULL
323}; 323};
324 324
325EFL_DEFINE_CLASS(elm_index_class_get, &_elm_index_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_UI_LAYOUT_ORIENTABLE_INTERFACE, EFL_INPUT_CLICKABLE_MIXIN, EFL_UI_SELECTABLE_INTERFACE, EFL_UI_LEGACY_INTERFACE, NULL); 325EFL_DEFINE_CLASS(elm_index_class_get, &_elm_index_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_UI_LAYOUT_ORIENTABLE_INTERFACE, EFL_INPUT_CLICKABLE_MIXIN, EFL_UI_SELECTABLE_INTERFACE, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
326 326
327#include "elm_index_eo.legacy.c" 327#include "elm_index_eo.legacy.c"
diff --git a/src/lib/elementary/elm_inwin_eo.c b/src/lib/elementary/elm_inwin_eo.c
index 887f9ee453..f8cab678ef 100644
--- a/src/lib/elementary/elm_inwin_eo.c
+++ b/src/lib/elementary/elm_inwin_eo.c
@@ -49,6 +49,6 @@ static const Efl_Class_Description _elm_inwin_class_desc = {
49 NULL 49 NULL
50}; 50};
51 51
52EFL_DEFINE_CLASS(elm_inwin_class_get, &_elm_inwin_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_UI_FOCUS_LAYER_MIXIN, EFL_CONTENT_INTERFACE, EFL_UI_LEGACY_INTERFACE, NULL); 52EFL_DEFINE_CLASS(elm_inwin_class_get, &_elm_inwin_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_UI_FOCUS_LAYER_MIXIN, EFL_CONTENT_INTERFACE, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
53 53
54#include "elm_inwin_eo.legacy.c" 54#include "elm_inwin_eo.legacy.c"
diff --git a/src/lib/elementary/elm_label_eo.c b/src/lib/elementary/elm_label_eo.c
index d19545f842..0ec366bad0 100644
--- a/src/lib/elementary/elm_label_eo.c
+++ b/src/lib/elementary/elm_label_eo.c
@@ -214,6 +214,6 @@ static const Efl_Class_Description _elm_label_class_desc = {
214 NULL 214 NULL
215}; 215};
216 216
217EFL_DEFINE_CLASS(elm_label_class_get, &_elm_label_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_UI_LEGACY_INTERFACE, NULL); 217EFL_DEFINE_CLASS(elm_label_class_get, &_elm_label_class_desc, EFL_UI_LAYOUT_BASE_CLASS, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
218 218
219#include "elm_label_eo.legacy.c" 219#include "elm_label_eo.legacy.c"
diff --git a/src/lib/elementary/elm_list_eo.c b/src/lib/elementary/elm_list_eo.c
index 32f0f77b92..dbd01f31bd 100644
--- a/src/lib/elementary/elm_list_eo.c
+++ b/src/lib/elementary/elm_list_eo.c
@@ -363,6 +363,6 @@ static const Efl_Class_Description _elm_list_class_desc = {
363 NULL 363 NULL
364}; 364};
365 365
366EFL_DEFINE_CLASS(elm_list_class_get, &_elm_list_class_desc, EFL_UI_LAYOUT_BASE_CLASS, ELM_INTERFACE_SCROLLABLE_MIXIN, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_ACCESS_SELECTION_INTERFACE, EFL_ACCESS_OBJECT_MIXIN, EFL_INPUT_CLICKABLE_MIXIN, EFL_UI_SELECTABLE_INTERFACE, EFL_UI_LEGACY_INTERFACE, ELM_WIDGET_ITEM_CONTAINER_INTERFACE, NULL); 366EFL_DEFINE_CLASS(elm_list_class_get, &_elm_list_class_desc, EFL_UI_LAYOUT_BASE_CLASS, ELM_INTERFACE_SCROLLABLE_MIXIN, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_ACCESS_SELECTION_INTERFACE, EFL_ACCESS_OBJECT_MIXIN, EFL_INPUT_CLICKABLE_MIXIN, EFL_UI_SELECTABLE_INTERFACE, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, ELM_WIDGET_ITEM_CONTAINER_INTERFACE, NULL);
367 367
368#include "elm_list_eo.legacy.c" 368#include "elm_list_eo.legacy.c"
diff --git a/src/lib/elementary/elm_multibuttonentry_eo.c b/src/lib/elementary/elm_multibuttonentry_eo.c
index d8697d015f..be0b5b60e2 100644
--- a/src/lib/elementary/elm_multibuttonentry_eo.c
+++ b/src/lib/elementary/elm_multibuttonentry_eo.c
@@ -219,6 +219,6 @@ static const Efl_Class_Description _elm_multibuttonentry_class_desc = {
219 NULL 219 NULL
220}; 220};
221 221
222EFL_DEFINE_CLASS(elm_multibuttonentry_class_get, &_elm_multibuttonentry_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_INPUT_CLICKABLE_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL); 222EFL_DEFINE_CLASS(elm_multibuttonentry_class_get, &_elm_multibuttonentry_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_INPUT_CLICKABLE_MIXIN, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
223 223
224#include "elm_multibuttonentry_eo.legacy.c" 224#include "elm_multibuttonentry_eo.legacy.c"
diff --git a/src/lib/elementary/elm_naviframe_eo.c b/src/lib/elementary/elm_naviframe_eo.c
index 5bbd65f531..784052b741 100644
--- a/src/lib/elementary/elm_naviframe_eo.c
+++ b/src/lib/elementary/elm_naviframe_eo.c
@@ -228,6 +228,6 @@ static const Efl_Class_Description _elm_naviframe_class_desc = {
228 NULL 228 NULL
229}; 229};
230 230
231EFL_DEFINE_CLASS(elm_naviframe_class_get, &_elm_naviframe_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL); 231EFL_DEFINE_CLASS(elm_naviframe_class_get, &_elm_naviframe_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_ACCESS_WIDGET_ACTION_MIXIN, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
232 232
233#include "elm_naviframe_eo.legacy.c" 233#include "elm_naviframe_eo.legacy.c"
diff --git a/src/lib/elementary/elm_panel_eo.c b/src/lib/elementary/elm_panel_eo.c
index d8b60f37e6..e4365972c5 100644
--- a/src/lib/elementary/elm_panel_eo.c
+++ b/src/lib/elementary/elm_panel_eo.c
@@ -205,6 +205,6 @@ static const Efl_Class_Description _elm_panel_class_desc = {
205 NULL 205 NULL
206}; 206};
207 207
208EFL_DEFINE_CLASS(elm_panel_class_get, &_elm_panel_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_UI_FOCUS_LAYER_MIXIN, ELM_INTERFACE_SCROLLABLE_MIXIN, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL); 208EFL_DEFINE_CLASS(elm_panel_class_get, &_elm_panel_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_UI_FOCUS_LAYER_MIXIN, ELM_INTERFACE_SCROLLABLE_MIXIN, EFL_ACCESS_WIDGET_ACTION_MIXIN, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
209 209
210#include "elm_panel_eo.legacy.c" 210#include "elm_panel_eo.legacy.c"
diff --git a/src/lib/elementary/elm_player_eo.c b/src/lib/elementary/elm_player_eo.c
index 067926faf6..faefe3fb88 100644
--- a/src/lib/elementary/elm_player_eo.c
+++ b/src/lib/elementary/elm_player_eo.c
@@ -70,4 +70,4 @@ static const Efl_Class_Description _elm_player_class_desc = {
70 NULL 70 NULL
71}; 71};
72 72
73EFL_DEFINE_CLASS(elm_player_class_get, &_elm_player_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL); 73EFL_DEFINE_CLASS(elm_player_class_get, &_elm_player_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_ACCESS_WIDGET_ACTION_MIXIN, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
diff --git a/src/lib/elementary/elm_popup_eo.c b/src/lib/elementary/elm_popup_eo.c
index 928638419d..b573f5d971 100644
--- a/src/lib/elementary/elm_popup_eo.c
+++ b/src/lib/elementary/elm_popup_eo.c
@@ -234,6 +234,6 @@ static const Efl_Class_Description _elm_popup_class_desc = {
234 NULL 234 NULL
235}; 235};
236 236
237EFL_DEFINE_CLASS(elm_popup_class_get, &_elm_popup_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL); 237EFL_DEFINE_CLASS(elm_popup_class_get, &_elm_popup_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_ACCESS_WIDGET_ACTION_MIXIN, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
238 238
239#include "elm_popup_eo.legacy.c" 239#include "elm_popup_eo.legacy.c"
diff --git a/src/lib/elementary/elm_priv.h b/src/lib/elementary/elm_priv.h
index 82faa149ea..ab82a12f0d 100644
--- a/src/lib/elementary/elm_priv.h
+++ b/src/lib/elementary/elm_priv.h
@@ -163,6 +163,7 @@
163# include "efl_ui_homogeneous_model.eo.h" 163# include "efl_ui_homogeneous_model.eo.h"
164# include "efl_ui_exact_model.eo.h" 164# include "efl_ui_exact_model.eo.h"
165# include "efl_ui_average_model.eo.h" 165# include "efl_ui_average_model.eo.h"
166#include "efl_ui_layout_legacy_eo.h"
166 167
167extern const char *_efl_model_property_itemw; 168extern const char *_efl_model_property_itemw;
168extern const char *_efl_model_property_itemh; 169extern const char *_efl_model_property_itemh;
diff --git a/src/lib/elementary/elm_route_eo.c b/src/lib/elementary/elm_route_eo.c
index 930eacdc30..48ad6b8d4b 100644
--- a/src/lib/elementary/elm_route_eo.c
+++ b/src/lib/elementary/elm_route_eo.c
@@ -51,6 +51,6 @@ static const Efl_Class_Description _elm_route_class_desc = {
51 NULL 51 NULL
52}; 52};
53 53
54EFL_DEFINE_CLASS(elm_route_class_get, &_elm_route_class_desc, EFL_UI_WIDGET_CLASS, EFL_UI_LEGACY_INTERFACE, NULL); 54EFL_DEFINE_CLASS(elm_route_class_get, &_elm_route_class_desc, EFL_UI_WIDGET_CLASS, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
55 55
56#include "elm_route_eo.legacy.c" 56#include "elm_route_eo.legacy.c"
diff --git a/src/lib/elementary/elm_scroller_eo.c b/src/lib/elementary/elm_scroller_eo.c
index dfac9caba6..ff511946dc 100644
--- a/src/lib/elementary/elm_scroller_eo.c
+++ b/src/lib/elementary/elm_scroller_eo.c
@@ -153,6 +153,6 @@ static const Efl_Class_Description _elm_scroller_class_desc = {
153 NULL 153 NULL
154}; 154};
155 155
156EFL_DEFINE_CLASS(elm_scroller_class_get, &_elm_scroller_class_desc, EFL_UI_LAYOUT_BASE_CLASS, ELM_INTERFACE_SCROLLABLE_MIXIN, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_UI_SCROLLABLE_INTERFACE, EFL_CONTENT_INTERFACE, EFL_UI_LEGACY_INTERFACE, NULL); 156EFL_DEFINE_CLASS(elm_scroller_class_get, &_elm_scroller_class_desc, EFL_UI_LAYOUT_BASE_CLASS, ELM_INTERFACE_SCROLLABLE_MIXIN, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_UI_SCROLLABLE_INTERFACE, EFL_CONTENT_INTERFACE, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
157 157
158#include "elm_scroller_eo.legacy.c" 158#include "elm_scroller_eo.legacy.c"
diff --git a/src/lib/elementary/elm_segment_control_eo.c b/src/lib/elementary/elm_segment_control_eo.c
index 931b473543..59a9cc2b72 100644
--- a/src/lib/elementary/elm_segment_control_eo.c
+++ b/src/lib/elementary/elm_segment_control_eo.c
@@ -90,6 +90,6 @@ static const Efl_Class_Description _elm_segment_control_class_desc = {
90 NULL 90 NULL
91}; 91};
92 92
93EFL_DEFINE_CLASS(elm_segment_control_class_get, &_elm_segment_control_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_UI_FOCUS_COMPOSITION_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL); 93EFL_DEFINE_CLASS(elm_segment_control_class_get, &_elm_segment_control_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_UI_FOCUS_COMPOSITION_MIXIN, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
94 94
95#include "elm_segment_control_eo.legacy.c" 95#include "elm_segment_control_eo.legacy.c"
diff --git a/src/lib/elementary/elm_separator_eo.c b/src/lib/elementary/elm_separator_eo.c
index 5dc45a041a..182739fb20 100644
--- a/src/lib/elementary/elm_separator_eo.c
+++ b/src/lib/elementary/elm_separator_eo.c
@@ -78,6 +78,6 @@ static const Efl_Class_Description _elm_separator_class_desc = {
78 NULL 78 NULL
79}; 79};
80 80
81EFL_DEFINE_CLASS(elm_separator_class_get, &_elm_separator_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_UI_LEGACY_INTERFACE, NULL); 81EFL_DEFINE_CLASS(elm_separator_class_get, &_elm_separator_class_desc, EFL_UI_LAYOUT_BASE_CLASS, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
82 82
83#include "elm_separator_eo.legacy.c" 83#include "elm_separator_eo.legacy.c"
diff --git a/src/lib/elementary/elm_slider_eo.c b/src/lib/elementary/elm_slider_eo.c
index 5f3ecc29e9..524235b8a1 100644
--- a/src/lib/elementary/elm_slider_eo.c
+++ b/src/lib/elementary/elm_slider_eo.c
@@ -86,4 +86,4 @@ static const Efl_Class_Description _elm_slider_class_desc = {
86 NULL 86 NULL
87}; 87};
88 88
89EFL_DEFINE_CLASS(elm_slider_class_get, &_elm_slider_class_desc, EFL_UI_SLIDER_INTERVAL_CLASS, EFL_UI_LEGACY_INTERFACE, EFL_TEXT_INTERFACE, EFL_TEXT_MARKUP_INTERFACE, EFL_UI_FORMAT_MIXIN, NULL); 89EFL_DEFINE_CLASS(elm_slider_class_get, &_elm_slider_class_desc, EFL_UI_SLIDER_INTERVAL_CLASS, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, EFL_TEXT_INTERFACE, EFL_TEXT_MARKUP_INTERFACE, EFL_UI_FORMAT_MIXIN, NULL);
diff --git a/src/lib/elementary/elm_slideshow_eo.c b/src/lib/elementary/elm_slideshow_eo.c
index 8860bf95e6..ef68acd2d0 100644
--- a/src/lib/elementary/elm_slideshow_eo.c
+++ b/src/lib/elementary/elm_slideshow_eo.c
@@ -316,6 +316,6 @@ static const Efl_Class_Description _elm_slideshow_class_desc = {
316 NULL 316 NULL
317}; 317};
318 318
319EFL_DEFINE_CLASS(elm_slideshow_class_get, &_elm_slideshow_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL); 319EFL_DEFINE_CLASS(elm_slideshow_class_get, &_elm_slideshow_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_ACCESS_WIDGET_ACTION_MIXIN, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
320 320
321#include "elm_slideshow_eo.legacy.c" 321#include "elm_slideshow_eo.legacy.c"
diff --git a/src/lib/elementary/elm_spinner_eo.c b/src/lib/elementary/elm_spinner_eo.c
index f4dde7d242..b659c9867f 100644
--- a/src/lib/elementary/elm_spinner_eo.c
+++ b/src/lib/elementary/elm_spinner_eo.c
@@ -330,6 +330,6 @@ static const Efl_Class_Description _elm_spinner_class_desc = {
330 NULL 330 NULL
331}; 331};
332 332
333EFL_DEFINE_CLASS(elm_spinner_class_get, &_elm_spinner_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_UI_RANGE_INTERACTIVE_INTERFACE, EFL_UI_FOCUS_COMPOSITION_MIXIN, EFL_ACCESS_VALUE_INTERFACE, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL); 333EFL_DEFINE_CLASS(elm_spinner_class_get, &_elm_spinner_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_UI_RANGE_INTERACTIVE_INTERFACE, EFL_UI_FOCUS_COMPOSITION_MIXIN, EFL_ACCESS_VALUE_INTERFACE, EFL_ACCESS_WIDGET_ACTION_MIXIN, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
334 334
335#include "elm_spinner_eo.legacy.c" 335#include "elm_spinner_eo.legacy.c"
diff --git a/src/lib/elementary/elm_thumb_eo.c b/src/lib/elementary/elm_thumb_eo.c
index d7a469060f..c94e12373a 100644
--- a/src/lib/elementary/elm_thumb_eo.c
+++ b/src/lib/elementary/elm_thumb_eo.c
@@ -82,4 +82,4 @@ static const Efl_Class_Description _elm_thumb_class_desc = {
82 NULL 82 NULL
83}; 83};
84 84
85EFL_DEFINE_CLASS(elm_thumb_class_get, &_elm_thumb_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_FILE_MIXIN, EFL_INPUT_CLICKABLE_MIXIN, EFL_UI_DRAGGABLE_INTERFACE, EFL_UI_LEGACY_INTERFACE, NULL); 85EFL_DEFINE_CLASS(elm_thumb_class_get, &_elm_thumb_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_FILE_MIXIN, EFL_INPUT_CLICKABLE_MIXIN, EFL_UI_DRAGGABLE_INTERFACE, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
diff --git a/src/lib/elementary/elm_widget_layout.h b/src/lib/elementary/elm_widget_layout.h
index d9cfa82e56..8ec9668c8e 100644
--- a/src/lib/elementary/elm_widget_layout.h
+++ b/src/lib/elementary/elm_widget_layout.h
@@ -47,7 +47,7 @@
47/** 47/**
48 * Base widget smart data extended with layout instance data. 48 * Base widget smart data extended with layout instance data.
49 */ 49 */
50typedef struct _Elm_Layout_Smart_Data 50typedef struct _Efl_Ui_Layout_Data
51{ 51{
52 Evas_Object *obj; /**< The object itself */ 52 Evas_Object *obj; /**< The object itself */
53 Eina_List *subs; /**< List of Elm_Layout_Sub_Object_Data structs, to hold the actual sub objects such as text, content and the children of box and table. */ 53 Eina_List *subs; /**< List of Elm_Layout_Sub_Object_Data structs, to hold the actual sub objects such as text, content and the children of box and table. */
@@ -66,7 +66,6 @@ typedef struct _Elm_Layout_Smart_Data
66 66
67 unsigned int finger_size_multiplier_x, finger_size_multiplier_y; /**< multipliers for finger_size during group_calc */ 67 unsigned int finger_size_multiplier_x, finger_size_multiplier_y; /**< multipliers for finger_size during group_calc */
68 68
69 Eina_Bool needs_size_calc : 1; /**< This flag is set true when the layout sizing eval is already requested. This defers sizing evaluation until smart calculation to avoid unnecessary calculation. */
70 Eina_Bool restricted_calc_w : 1; /**< This is a flag to support edje restricted_calc in w axis. */ 69 Eina_Bool restricted_calc_w : 1; /**< This is a flag to support edje restricted_calc in w axis. */
71 Eina_Bool restricted_calc_h : 1; /**< This is a flag to support edje restricted_calc in y axis. */ 70 Eina_Bool restricted_calc_h : 1; /**< This is a flag to support edje restricted_calc in y axis. */
72 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. */
@@ -78,6 +77,11 @@ typedef struct _Elm_Layout_Smart_Data
78 Eina_Bool calc_subobjs : 1; /**< Set to true if group_calc should also handle subobjs during manual calc */ 77 Eina_Bool calc_subobjs : 1; /**< Set to true if group_calc should also handle subobjs during manual calc */
79} Efl_Ui_Layout_Data; 78} Efl_Ui_Layout_Data;
80 79
80typedef struct _Elm_Layout_Data
81{
82 Eina_Bool needs_size_calc : 1; /**< This flag is set true when the layout sizing eval is already requested. This defers sizing evaluation until smart calculation to avoid unnecessary calculation. */
83} Elm_Layout_Data;
84
81/** 85/**
82 * @} 86 * @}
83 */ 87 */