summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-07-28 15:35:10 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-08-04 10:24:03 +0900
commit796d4b138ba3c1b0064b2260b6626a682dc9a30f (patch)
tree2917aed75aef06c0e7c8ff92445779669131cf2b
parent94d3fd3d82564ead619c7eef1eaccd70968031b4 (diff)
elm: Make content and text aliases internal only
This removes the APIs from the EO API. Ref T5315
-rw-r--r--src/lib/elementary/efl_ui_button.c18
-rw-r--r--src/lib/elementary/efl_ui_button.eo2
-rw-r--r--src/lib/elementary/efl_ui_check.c12
-rw-r--r--src/lib/elementary/efl_ui_check.eo1
-rw-r--r--src/lib/elementary/efl_ui_frame.c20
-rw-r--r--src/lib/elementary/efl_ui_frame.eo2
-rw-r--r--src/lib/elementary/efl_ui_progressbar.c18
-rw-r--r--src/lib/elementary/efl_ui_progressbar.eo2
-rw-r--r--src/lib/elementary/efl_ui_radio.c12
-rw-r--r--src/lib/elementary/efl_ui_radio.eo1
-rw-r--r--src/lib/elementary/efl_ui_slider.c18
-rw-r--r--src/lib/elementary/efl_ui_slider.eo2
-rw-r--r--src/lib/elementary/efl_ui_text.c12
-rw-r--r--src/lib/elementary/efl_ui_text.eo1
-rw-r--r--src/lib/elementary/elm_actionslider.c10
-rw-r--r--src/lib/elementary/elm_actionslider.eo1
-rw-r--r--src/lib/elementary/elm_bg.c10
-rw-r--r--src/lib/elementary/elm_bg.eo1
-rw-r--r--src/lib/elementary/elm_bubble.c19
-rw-r--r--src/lib/elementary/elm_bubble.eo2
-rw-r--r--src/lib/elementary/elm_conform.c11
-rw-r--r--src/lib/elementary/elm_conformant.eo1
-rw-r--r--src/lib/elementary/elm_entry.c20
-rw-r--r--src/lib/elementary/elm_entry.eo2
-rw-r--r--src/lib/elementary/elm_hover.c11
-rw-r--r--src/lib/elementary/elm_hover.eo1
-rw-r--r--src/lib/elementary/elm_inwin.c12
-rw-r--r--src/lib/elementary/elm_inwin.eo1
-rw-r--r--src/lib/elementary/elm_layout.c25
-rw-r--r--src/lib/elementary/elm_layout.eo18
-rw-r--r--src/lib/elementary/elm_panes.c12
-rw-r--r--src/lib/elementary/elm_panes.eo1
-rw-r--r--src/lib/elementary/elm_priv.h20
33 files changed, 115 insertions, 184 deletions
diff --git a/src/lib/elementary/efl_ui_button.c b/src/lib/elementary/efl_ui_button.c
index d86ff46..e4794be 100644
--- a/src/lib/elementary/efl_ui_button.c
+++ b/src/lib/elementary/efl_ui_button.c
@@ -14,6 +14,7 @@
14#include "elm_part_helper.h" 14#include "elm_part_helper.h"
15 15
16#define MY_CLASS EFL_UI_BUTTON_CLASS 16#define MY_CLASS EFL_UI_BUTTON_CLASS
17#define MY_CLASS_PFX efl_ui_button
17 18
18#define MY_CLASS_NAME "Efl.Ui.Button" 19#define MY_CLASS_NAME "Efl.Ui.Button"
19#define MY_CLASS_NAME_LEGACY "elm_button" 20#define MY_CLASS_NAME_LEGACY "elm_button"
@@ -311,18 +312,6 @@ _efl_ui_button_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Button_Data *_pd EINA_
311 CRI("Failed to set layout!"); 312 CRI("Failed to set layout!");
312} 313}
313 314
314EOLIAN static const Elm_Layout_Part_Alias_Description*
315_efl_ui_button_elm_layout_content_aliases_get(Eo *obj EINA_UNUSED, Efl_Ui_Button_Data *_pd EINA_UNUSED)
316{
317 return _content_aliases;
318}
319
320EOLIAN static const Elm_Layout_Part_Alias_Description*
321_efl_ui_button_elm_layout_text_aliases_get(Eo *obj EINA_UNUSED, Efl_Ui_Button_Data *_pd EINA_UNUSED)
322{
323 return _text_aliases;
324}
325
326EAPI Evas_Object * 315EAPI Evas_Object *
327elm_button_add(Evas_Object *parent) 316elm_button_add(Evas_Object *parent)
328{ 317{
@@ -492,7 +481,12 @@ elm_button_autorepeat_get(const Evas_Object *obj)
492 481
493/* Internal EO APIs and hidden overrides */ 482/* Internal EO APIs and hidden overrides */
494 483
484ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT()
485ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT()
486
495#define EFL_UI_BUTTON_EXTRA_OPS \ 487#define EFL_UI_BUTTON_EXTRA_OPS \
488 ELM_LAYOUT_CONTENT_ALIASES_OPS(), \
489 ELM_LAYOUT_TEXT_ALIASES_OPS(), \
496 EFL_CANVAS_GROUP_ADD_OPS(efl_ui_button) 490 EFL_CANVAS_GROUP_ADD_OPS(efl_ui_button)
497 491
498#include "efl_ui_button.eo.c" 492#include "efl_ui_button.eo.c"
diff --git a/src/lib/elementary/efl_ui_button.eo b/src/lib/elementary/efl_ui_button.eo
index cdde5ce..3fb19f8 100644
--- a/src/lib/elementary/efl_ui_button.eo
+++ b/src/lib/elementary/efl_ui_button.eo
@@ -22,8 +22,6 @@ class Efl.Ui.Button (Elm.Layout, Efl.Ui.Clickable, Efl.Ui.Autorepeat, Efl.Text,
22 Elm.Widget.theme_apply; 22 Elm.Widget.theme_apply;
23 Elm.Widget.sub_object_del; 23 Elm.Widget.sub_object_del;
24 Elm.Widget.widget_event; 24 Elm.Widget.widget_event;
25 Elm.Layout.text_aliases { get; }
26 Elm.Layout.content_aliases { get; }
27 Elm.Layout.sizing_eval; 25 Elm.Layout.sizing_eval;
28 Elm.Interface.Atspi_Widget_Action.elm_actions { get; } 26 Elm.Interface.Atspi_Widget_Action.elm_actions { get; }
29 Efl.Part.part; 27 Efl.Part.part;
diff --git a/src/lib/elementary/efl_ui_check.c b/src/lib/elementary/efl_ui_check.c
index a23d4f7..3c97830 100644
--- a/src/lib/elementary/efl_ui_check.c
+++ b/src/lib/elementary/efl_ui_check.c
@@ -13,6 +13,7 @@
13#include "efl_ui_check_private.h" 13#include "efl_ui_check_private.h"
14 14
15#define MY_CLASS EFL_UI_CHECK_CLASS 15#define MY_CLASS EFL_UI_CHECK_CLASS
16#define MY_CLASS_PFX efl_ui_check
16 17
17#define MY_CLASS_NAME "Efl.Ui.Check" 18#define MY_CLASS_NAME "Efl.Ui.Check"
18#define MY_CLASS_NAME_LEGACY "elm_check" 19#define MY_CLASS_NAME_LEGACY "elm_check"
@@ -322,12 +323,6 @@ _efl_ui_check_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Check_Data *_pd EINA_UN
322 elm_layout_sizing_eval(obj); 323 elm_layout_sizing_eval(obj);
323} 324}
324 325
325EOLIAN static const Elm_Layout_Part_Alias_Description*
326_efl_ui_check_elm_layout_text_aliases_get(Eo *obj EINA_UNUSED, Efl_Ui_Check_Data *_pd EINA_UNUSED)
327{
328 return _text_aliases;
329}
330
331EOLIAN static Eina_Bool 326EOLIAN static Eina_Bool
332_efl_ui_check_selected_get(Eo *obj, Efl_Ui_Check_Data *pd EINA_UNUSED) 327_efl_ui_check_selected_get(Eo *obj, Efl_Ui_Check_Data *pd EINA_UNUSED)
333{ 328{
@@ -433,7 +428,10 @@ _efl_ui_check_class_constructor(Efl_Class *klass)
433 428
434/* Internal EO APIs and hidden overrides */ 429/* Internal EO APIs and hidden overrides */
435 430
431ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT()
432
436#define EFL_UI_CHECK_EXTRA_OPS \ 433#define EFL_UI_CHECK_EXTRA_OPS \
437 EFL_CANVAS_GROUP_ADD_OPS(efl_ui_check) 434 EFL_CANVAS_GROUP_ADD_OPS(efl_ui_check), \
435 ELM_LAYOUT_TEXT_ALIASES_OPS()
438 436
439#include "efl_ui_check.eo.c" 437#include "efl_ui_check.eo.c"
diff --git a/src/lib/elementary/efl_ui_check.eo b/src/lib/elementary/efl_ui_check.eo
index 833547d..756a772 100644
--- a/src/lib/elementary/efl_ui_check.eo
+++ b/src/lib/elementary/efl_ui_check.eo
@@ -27,7 +27,6 @@ class Efl.Ui.Check (Efl.Ui.Nstate, Elm.Interface.Atspi_Widget_Action)
27 Elm.Widget.theme_apply; 27 Elm.Widget.theme_apply;
28 Elm.Widget.sub_object_del; 28 Elm.Widget.sub_object_del;
29 Elm.Widget.widget_event; 29 Elm.Widget.widget_event;
30 Elm.Layout.text_aliases { get; }
31 Efl.Ui.Nstate.count { set; } 30 Efl.Ui.Nstate.count { set; }
32 Efl.Ui.Nstate.value { set; } 31 Efl.Ui.Nstate.value { set; }
33 Elm.Interface.Atspi_Accessible.state_set { get; } 32 Elm.Interface.Atspi_Accessible.state_set { get; }
diff --git a/src/lib/elementary/efl_ui_frame.c b/src/lib/elementary/efl_ui_frame.c
index 800d13e..937b384 100644
--- a/src/lib/elementary/efl_ui_frame.c
+++ b/src/lib/elementary/efl_ui_frame.c
@@ -11,6 +11,7 @@
11#include "elm_widget_layout.h" 11#include "elm_widget_layout.h"
12 12
13#define MY_CLASS EFL_UI_FRAME_CLASS 13#define MY_CLASS EFL_UI_FRAME_CLASS
14#define MY_CLASS_PFX efl_ui_frame
14#define MY_CLASS_NAME "Efl.Ui.Frame" 15#define MY_CLASS_NAME "Efl.Ui.Frame"
15#define MY_CLASS_NAME_LEGACY "elm_frame" 16#define MY_CLASS_NAME_LEGACY "elm_frame"
16 17
@@ -178,18 +179,6 @@ _efl_ui_frame_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Frame_Data *_pd EINA_UN
178 elm_layout_sizing_eval(obj); 179 elm_layout_sizing_eval(obj);
179} 180}
180 181
181EOLIAN static const Elm_Layout_Part_Alias_Description*
182_efl_ui_frame_elm_layout_content_aliases_get(Eo *obj EINA_UNUSED, Efl_Ui_Frame_Data *_pd EINA_UNUSED)
183{
184 return _content_aliases;
185}
186
187EOLIAN static const Elm_Layout_Part_Alias_Description*
188_efl_ui_frame_elm_layout_text_aliases_get(Eo *obj EINA_UNUSED, Efl_Ui_Frame_Data *_pd EINA_UNUSED)
189{
190 return _text_aliases;
191}
192
193EAPI Evas_Object * 182EAPI Evas_Object *
194elm_frame_add(Evas_Object *parent) 183elm_frame_add(Evas_Object *parent)
195{ 184{
@@ -280,7 +269,12 @@ _efl_ui_frame_class_constructor(Efl_Class *klass)
280 269
281/* Internal EO APIs and hidden overrides */ 270/* Internal EO APIs and hidden overrides */
282 271
272ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT()
273ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT()
274
283#define EFL_UI_FRAME_EXTRA_OPS \ 275#define EFL_UI_FRAME_EXTRA_OPS \
284 EFL_CANVAS_GROUP_ADD_OPS(efl_ui_frame) 276 EFL_CANVAS_GROUP_ADD_OPS(efl_ui_frame), \
277 ELM_LAYOUT_CONTENT_ALIASES_OPS(), \
278 ELM_LAYOUT_TEXT_ALIASES_OPS()
285 279
286#include "efl_ui_frame.eo.c" 280#include "efl_ui_frame.eo.c"
diff --git a/src/lib/elementary/efl_ui_frame.eo b/src/lib/elementary/efl_ui_frame.eo
index 126d99d..3c233bf 100644
--- a/src/lib/elementary/efl_ui_frame.eo
+++ b/src/lib/elementary/efl_ui_frame.eo
@@ -60,8 +60,6 @@ class Efl.Ui.Frame (Elm.Layout, Efl.Ui.Clickable, Efl.Text)
60 Elm.Widget.focus_next_manager_is; 60 Elm.Widget.focus_next_manager_is;
61 Elm.Widget.focus_next; 61 Elm.Widget.focus_next;
62 Elm.Widget.focus_direction_manager_is; 62 Elm.Widget.focus_direction_manager_is;
63 Elm.Layout.text_aliases { get; }
64 Elm.Layout.content_aliases { get; }
65 Efl.Text.text { get; set; } 63 Efl.Text.text { get; set; }
66 } 64 }
67} 65}
diff --git a/src/lib/elementary/efl_ui_progressbar.c b/src/lib/elementary/efl_ui_progressbar.c
index 2278142..df573d0 100644
--- a/src/lib/elementary/efl_ui_progressbar.c
+++ b/src/lib/elementary/efl_ui_progressbar.c
@@ -15,6 +15,7 @@
15#include "elm_part_helper.h" 15#include "elm_part_helper.h"
16 16
17#define MY_CLASS EFL_UI_PROGRESSBAR_CLASS 17#define MY_CLASS EFL_UI_PROGRESSBAR_CLASS
18#define MY_CLASS_PFX efl_ui_progressbar
18 19
19#define MY_CLASS_NAME "Efl.Ui.Progressbar" 20#define MY_CLASS_NAME "Efl.Ui.Progressbar"
20#define MY_CLASS_NAME_LEGACY "elm_progressbar" 21#define MY_CLASS_NAME_LEGACY "elm_progressbar"
@@ -335,18 +336,6 @@ _efl_ui_progressbar_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Progressbar_Data
335 efl_canvas_group_del(efl_super(obj, MY_CLASS)); 336 efl_canvas_group_del(efl_super(obj, MY_CLASS));
336} 337}
337 338
338EOLIAN static const Elm_Layout_Part_Alias_Description*
339_efl_ui_progressbar_elm_layout_text_aliases_get(Eo *obj EINA_UNUSED, Efl_Ui_Progressbar_Data *_pd EINA_UNUSED)
340{
341 return _text_aliases;
342}
343
344EOLIAN static const Elm_Layout_Part_Alias_Description*
345_efl_ui_progressbar_elm_layout_content_aliases_get(Eo *obj EINA_UNUSED, Efl_Ui_Progressbar_Data *_pd EINA_UNUSED)
346{
347 return _content_aliases;
348}
349
350EAPI Evas_Object * 339EAPI Evas_Object *
351elm_progressbar_add(Evas_Object *parent) 340elm_progressbar_add(Evas_Object *parent)
352{ 341{
@@ -691,7 +680,12 @@ _efl_ui_progressbar_internal_part_efl_ui_range_range_value_get(Eo *obj, Elm_Part
691 680
692/* Internal EO APIs and hidden overrides */ 681/* Internal EO APIs and hidden overrides */
693 682
683ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT()
684ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT()
685
694#define EFL_UI_PROGRESSBAR_EXTRA_OPS \ 686#define EFL_UI_PROGRESSBAR_EXTRA_OPS \
687 ELM_LAYOUT_CONTENT_ALIASES_OPS(), \
688 ELM_LAYOUT_TEXT_ALIASES_OPS(), \
695 EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_progressbar) 689 EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_progressbar)
696 690
697#include "efl_ui_progressbar.eo.c" 691#include "efl_ui_progressbar.eo.c"
diff --git a/src/lib/elementary/efl_ui_progressbar.eo b/src/lib/elementary/efl_ui_progressbar.eo
index e2e1127..3791f30 100644
--- a/src/lib/elementary/efl_ui_progressbar.eo
+++ b/src/lib/elementary/efl_ui_progressbar.eo
@@ -54,8 +54,6 @@ class Efl.Ui.Progressbar (Elm.Layout, Efl.Ui.Range,
54 Elm.Widget.focus_next_manager_is; 54 Elm.Widget.focus_next_manager_is;
55 Elm.Widget.focus_direction_manager_is; 55 Elm.Widget.focus_direction_manager_is;
56 Elm.Widget.sub_object_del; 56 Elm.Widget.sub_object_del;
57 Elm.Layout.text_aliases { get; }
58 Elm.Layout.content_aliases { get; }
59 Elm.Layout.sizing_eval; 57 Elm.Layout.sizing_eval;
60 Efl.Ui.Range.span_size { get; set; } 58 Efl.Ui.Range.span_size { get; set; }
61 Efl.Ui.Range.range_value { get; set; } 59 Efl.Ui.Range.range_value { get; set; }
diff --git a/src/lib/elementary/efl_ui_radio.c b/src/lib/elementary/efl_ui_radio.c
index 41731a1..2838771 100644
--- a/src/lib/elementary/efl_ui_radio.c
+++ b/src/lib/elementary/efl_ui_radio.c
@@ -13,6 +13,7 @@
13#include "elm_widget_layout.h" 13#include "elm_widget_layout.h"
14 14
15#define MY_CLASS EFL_UI_RADIO_CLASS 15#define MY_CLASS EFL_UI_RADIO_CLASS
16#define MY_CLASS_PFX efl_ui_radio
16 17
17#define MY_CLASS_NAME "Efl.Ui.Radio" 18#define MY_CLASS_NAME "Efl.Ui.Radio"
18#define MY_CLASS_NAME_LEGACY "elm_radio" 19#define MY_CLASS_NAME_LEGACY "elm_radio"
@@ -256,12 +257,6 @@ _efl_ui_radio_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Radio_Data *sd)
256 efl_canvas_group_del(efl_super(obj, EFL_UI_CHECK_CLASS)); 257 efl_canvas_group_del(efl_super(obj, EFL_UI_CHECK_CLASS));
257} 258}
258 259
259EOLIAN static const Elm_Layout_Part_Alias_Description*
260_efl_ui_radio_elm_layout_text_aliases_get(Eo *obj EINA_UNUSED, Efl_Ui_Radio_Data *_pd EINA_UNUSED)
261{
262 return _text_aliases;
263}
264
265EAPI Evas_Object * 260EAPI Evas_Object *
266elm_radio_add(Evas_Object *parent) 261elm_radio_add(Evas_Object *parent)
267{ 262{
@@ -406,7 +401,10 @@ _efl_ui_radio_elm_interface_atspi_accessible_state_set_get(Eo *obj, Efl_Ui_Radio
406 401
407/* Internal EO APIs and hidden overrides */ 402/* Internal EO APIs and hidden overrides */
408 403
404ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT()
405
409#define EFL_UI_RADIO_EXTRA_OPS \ 406#define EFL_UI_RADIO_EXTRA_OPS \
410 EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_radio) 407 EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_radio), \
408 ELM_LAYOUT_TEXT_ALIASES_OPS()
411 409
412#include "efl_ui_radio.eo.c" 410#include "efl_ui_radio.eo.c"
diff --git a/src/lib/elementary/efl_ui_radio.eo b/src/lib/elementary/efl_ui_radio.eo
index 911126f..9106f11 100644
--- a/src/lib/elementary/efl_ui_radio.eo
+++ b/src/lib/elementary/efl_ui_radio.eo
@@ -80,7 +80,6 @@ class Efl.Ui.Radio (Efl.Ui.Check, Elm.Interface.Atspi_Widget_Action)
80 Elm.Widget.theme_apply; 80 Elm.Widget.theme_apply;
81 Elm.Widget.activate; 81 Elm.Widget.activate;
82 Elm.Widget.widget_event; 82 Elm.Widget.widget_event;
83 Elm.Layout.text_aliases { get; }
84 Elm.Interface.Atspi_Accessible.state_set { get; } 83 Elm.Interface.Atspi_Accessible.state_set { get; }
85 Elm.Interface.Atspi_Widget_Action.elm_actions { get; } 84 Elm.Interface.Atspi_Widget_Action.elm_actions { get; }
86 } 85 }
diff --git a/src/lib/elementary/efl_ui_slider.c b/src/lib/elementary/efl_ui_slider.c
index 9925b94..ed78fbf 100644
--- a/src/lib/elementary/efl_ui_slider.c
+++ b/src/lib/elementary/efl_ui_slider.c
@@ -17,6 +17,7 @@
17#include "elm_part_helper.h" 17#include "elm_part_helper.h"
18 18
19#define MY_CLASS EFL_UI_SLIDER_CLASS 19#define MY_CLASS EFL_UI_SLIDER_CLASS
20#define MY_CLASS_PFX efl_ui_slider
20 21
21#define MY_CLASS_NAME "Efl.Ui.Slider" 22#define MY_CLASS_NAME "Efl.Ui.Slider"
22#define MY_CLASS_NAME_LEGACY "elm_slider" 23#define MY_CLASS_NAME_LEGACY "elm_slider"
@@ -1217,18 +1218,6 @@ _efl_ui_slider_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Slider_Data *sd)
1217 efl_canvas_group_del(efl_super(obj, MY_CLASS)); 1218 efl_canvas_group_del(efl_super(obj, MY_CLASS));
1218} 1219}
1219 1220
1220EOLIAN static const Elm_Layout_Part_Alias_Description*
1221_efl_ui_slider_elm_layout_text_aliases_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *_pd EINA_UNUSED)
1222{
1223 return _text_aliases;
1224}
1225
1226EOLIAN static const Elm_Layout_Part_Alias_Description*
1227_efl_ui_slider_elm_layout_content_aliases_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *_pd EINA_UNUSED)
1228{
1229 return _content_aliases;
1230}
1231
1232EOLIAN static Eina_Bool 1221EOLIAN static Eina_Bool
1233_efl_ui_slider_efl_ui_range_range_interval_enabled_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *pd) 1222_efl_ui_slider_efl_ui_range_range_interval_enabled_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *pd)
1234{ 1223{
@@ -1793,7 +1782,12 @@ elm_slider_min_max_get(const Evas_Object *obj, double *min, double *max)
1793 1782
1794/* Internal EO APIs and hidden overrides */ 1783/* Internal EO APIs and hidden overrides */
1795 1784
1785ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT()
1786ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT()
1787
1796#define EFL_UI_SLIDER_EXTRA_OPS \ 1788#define EFL_UI_SLIDER_EXTRA_OPS \
1789 ELM_LAYOUT_CONTENT_ALIASES_OPS(), \
1790 ELM_LAYOUT_TEXT_ALIASES_OPS(), \
1797 EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_slider) 1791 EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_slider)
1798 1792
1799#include "efl_ui_slider.eo.c" 1793#include "efl_ui_slider.eo.c"
diff --git a/src/lib/elementary/efl_ui_slider.eo b/src/lib/elementary/efl_ui_slider.eo
index 4e46a41..ab63a50 100644
--- a/src/lib/elementary/efl_ui_slider.eo
+++ b/src/lib/elementary/efl_ui_slider.eo
@@ -122,8 +122,6 @@ class Efl.Ui.Slider (Elm.Layout, Efl.Ui.Range,
122 Elm.Widget.focus_direction_manager_is; 122 Elm.Widget.focus_direction_manager_is;
123 Elm.Widget.on_focus; 123 Elm.Widget.on_focus;
124 Elm.Widget.widget_event; 124 Elm.Widget.widget_event;
125 Elm.Layout.text_aliases { get; }
126 Elm.Layout.content_aliases { get; }
127 Elm.Layout.sizing_eval; 125 Elm.Layout.sizing_eval;
128 Efl.Ui.Range.span_size { get; set; } 126 Efl.Ui.Range.span_size { get; set; }
129 Efl.Ui.Range.range_value { get; set; } 127 Efl.Ui.Range.range_value { get; set; }
diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c
index 9bb136b..16ae6f6 100644
--- a/src/lib/elementary/efl_ui_text.c
+++ b/src/lib/elementary/efl_ui_text.c
@@ -178,6 +178,7 @@ struct _Efl_Ui_Text_Rectangle
178}; 178};
179 179
180#define MY_CLASS EFL_UI_TEXT_CLASS 180#define MY_CLASS EFL_UI_TEXT_CLASS
181#define MY_CLASS_PFX efl_ui_text
181#define MY_CLASS_NAME "Efl.Ui.Text" 182#define MY_CLASS_NAME "Efl.Ui.Text"
182#define MY_CLASS_NAME_LEGACY "elm_entry" 183#define MY_CLASS_NAME_LEGACY "elm_entry"
183 184
@@ -3327,12 +3328,6 @@ _efl_ui_text_efl_canvas_group_group_member_add(Eo *obj, Efl_Ui_Text_Data *sd, Ev
3327 evas_object_raise(sd->hit_rect); 3328 evas_object_raise(sd->hit_rect);
3328} 3329}
3329 3330
3330EOLIAN static const Elm_Layout_Part_Alias_Description *
3331_efl_ui_text_elm_layout_content_aliases_get(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd EINA_UNUSED)
3332{
3333 return _content_aliases;
3334}
3335
3336EOLIAN static Eina_Bool 3331EOLIAN static Eina_Bool
3337_efl_ui_text_elm_layout_theme_enable(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd EINA_UNUSED) 3332_efl_ui_text_elm_layout_theme_enable(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd EINA_UNUSED)
3338{ 3333{
@@ -5372,8 +5367,11 @@ ELM_PART_OVERRIDE_CONTENT_UNSET(elm_entry, EFL_UI_TEXT, ELM_LAYOUT, Efl_Ui_Text_
5372 5367
5373/* Internal EO APIs and hidden overrides */ 5368/* Internal EO APIs and hidden overrides */
5374 5369
5370ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT()
5371
5375#define EFL_UI_TEXT_EXTRA_OPS \ 5372#define EFL_UI_TEXT_EXTRA_OPS \
5376 EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_text) 5373 EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_text), \
5374 ELM_LAYOUT_CONTENT_ALIASES_OPS()
5377 5375
5378#include "efl_ui_text.eo.c" 5376#include "efl_ui_text.eo.c"
5379 5377
diff --git a/src/lib/elementary/efl_ui_text.eo b/src/lib/elementary/efl_ui_text.eo
index cf9c8ec..9793c51 100644
--- a/src/lib/elementary/efl_ui_text.eo
+++ b/src/lib/elementary/efl_ui_text.eo
@@ -417,7 +417,6 @@ class Efl.Ui.Text (Elm.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
417 Elm.Layout.signal_callback_add; 417 Elm.Layout.signal_callback_add;
418 Elm.Layout.signal_callback_del; 418 Elm.Layout.signal_callback_del;
419 Elm.Layout.signal_emit; 419 Elm.Layout.signal_emit;
420 Elm.Layout.content_aliases { get; }
421 Elm.Interface_Scrollable.policy { set; } 420 Elm.Interface_Scrollable.policy { set; }
422 Elm.Interface_Scrollable.bounce_allow { set; } 421 Elm.Interface_Scrollable.bounce_allow { set; }
423 Elm.Interface.Atspi_Accessible.state_set { get; } 422 Elm.Interface.Atspi_Accessible.state_set { get; }
diff --git a/src/lib/elementary/elm_actionslider.c b/src/lib/elementary/elm_actionslider.c
index e5171b8..0a60c36 100644
--- a/src/lib/elementary/elm_actionslider.c
+++ b/src/lib/elementary/elm_actionslider.c
@@ -17,6 +17,7 @@
17#include "elm_part_helper.h" 17#include "elm_part_helper.h"
18 18
19#define MY_CLASS ELM_ACTIONSLIDER_CLASS 19#define MY_CLASS ELM_ACTIONSLIDER_CLASS
20#define MY_CLASS_FPX elm_actionslider
20 21
21#define MY_CLASS_NAME "Elm_Actionslider" 22#define MY_CLASS_NAME "Elm_Actionslider"
22#define MY_CLASS_NAME_LEGACY "elm_actionslider" 23#define MY_CLASS_NAME_LEGACY "elm_actionslider"
@@ -534,12 +535,6 @@ _elm_actionslider_efl_canvas_group_group_add(Eo *obj, Elm_Actionslider_Data *pri
534 elm_layout_sizing_eval(obj); 535 elm_layout_sizing_eval(obj);
535} 536}
536 537
537EOLIAN static const Elm_Layout_Part_Alias_Description*
538_elm_actionslider_elm_layout_text_aliases_get(Eo *obj EINA_UNUSED, Elm_Actionslider_Data *_pd EINA_UNUSED)
539{
540 return _text_aliases;
541}
542
543EAPI Evas_Object * 538EAPI Evas_Object *
544elm_actionslider_add(Evas_Object *parent) 539elm_actionslider_add(Evas_Object *parent)
545{ 540{
@@ -673,7 +668,10 @@ ELM_PART_OVERRIDE_TEXT_GET(elm_actionslider, ELM_ACTIONSLIDER, ELM_LAYOUT, Elm_A
673 668
674/* Internal EO APIs and hidden overrides */ 669/* Internal EO APIs and hidden overrides */
675 670
671ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT()
672
676#define ELM_ACTIONSLIDER_EXTRA_OPS \ 673#define ELM_ACTIONSLIDER_EXTRA_OPS \
674 ELM_LAYOUT_TEXT_ALIASES_OPS(), \
677 EFL_CANVAS_GROUP_ADD_OPS(elm_actionslider) 675 EFL_CANVAS_GROUP_ADD_OPS(elm_actionslider)
678 676
679#include "elm_actionslider.eo.c" 677#include "elm_actionslider.eo.c"
diff --git a/src/lib/elementary/elm_actionslider.eo b/src/lib/elementary/elm_actionslider.eo
index 1b65127..6d0be32 100644
--- a/src/lib/elementary/elm_actionslider.eo
+++ b/src/lib/elementary/elm_actionslider.eo
@@ -74,7 +74,6 @@ class Elm.Actionslider (Elm.Layout, Efl.Ui.Selectable)
74 Elm.Widget.focus_next_manager_is; 74 Elm.Widget.focus_next_manager_is;
75 Elm.Widget.focus_direction_manager_is; 75 Elm.Widget.focus_direction_manager_is;
76 Elm.Widget.theme_apply; 76 Elm.Widget.theme_apply;
77 Elm.Layout.text_aliases { get; }
78 Elm.Layout.sizing_eval; 77 Elm.Layout.sizing_eval;
79 Efl.Part.part; 78 Efl.Part.part;
80 } 79 }
diff --git a/src/lib/elementary/elm_bg.c b/src/lib/elementary/elm_bg.c
index 6af7e05..3386f7e 100644
--- a/src/lib/elementary/elm_bg.c
+++ b/src/lib/elementary/elm_bg.c
@@ -11,6 +11,7 @@
11#include "elm_widget_layout.h" 11#include "elm_widget_layout.h"
12 12
13#define MY_CLASS ELM_BG_CLASS 13#define MY_CLASS ELM_BG_CLASS
14#define MY_CLASS_PFX elm_bg
14 15
15#define MY_CLASS_NAME "Elm_Bg" 16#define MY_CLASS_NAME "Elm_Bg"
16#define MY_CLASS_NAME_LEGACY "elm_bg" 17#define MY_CLASS_NAME_LEGACY "elm_bg"
@@ -104,12 +105,6 @@ _elm_bg_efl_canvas_group_group_add(Eo *obj, Elm_Bg_Data *priv)
104 CRI("Failed to set layout!"); 105 CRI("Failed to set layout!");
105} 106}
106 107
107EOLIAN static const Elm_Layout_Part_Alias_Description*
108_elm_bg_elm_layout_content_aliases_get(Eo *obj EINA_UNUSED, Elm_Bg_Data *_pd EINA_UNUSED)
109{
110 return _content_aliases;
111}
112
113EAPI Evas_Object * 108EAPI Evas_Object *
114elm_bg_add(Evas_Object *parent) 109elm_bg_add(Evas_Object *parent)
115{ 110{
@@ -287,7 +282,10 @@ elm_bg_file_get(const Eo *obj, const char **file, const char **group)
287 282
288/* Internal EO APIs and hidden overrides */ 283/* Internal EO APIs and hidden overrides */
289 284
285ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT()
286
290#define ELM_BG_EXTRA_OPS \ 287#define ELM_BG_EXTRA_OPS \
288 ELM_LAYOUT_CONTENT_ALIASES_OPS(), \
291 EFL_CANVAS_GROUP_ADD_OPS(elm_bg) 289 EFL_CANVAS_GROUP_ADD_OPS(elm_bg)
292 290
293#include "elm_bg.eo.c" 291#include "elm_bg.eo.c"
diff --git a/src/lib/elementary/elm_bg.eo b/src/lib/elementary/elm_bg.eo
index 7bc2f61..8ec3915 100644
--- a/src/lib/elementary/elm_bg.eo
+++ b/src/lib/elementary/elm_bg.eo
@@ -96,7 +96,6 @@ class Elm.Bg (Elm.Layout, Efl.File)
96 implements { 96 implements {
97 class.constructor; 97 class.constructor;
98 Efl.Object.constructor; 98 Efl.Object.constructor;
99 Elm.Layout.content_aliases { get; }
100 Elm.Layout.sizing_eval; 99 Elm.Layout.sizing_eval;
101 Efl.File.file { get; set; } 100 Efl.File.file { get; set; }
102 } 101 }
diff --git a/src/lib/elementary/elm_bubble.c b/src/lib/elementary/elm_bubble.c
index ecec425..d58ac97 100644
--- a/src/lib/elementary/elm_bubble.c
+++ b/src/lib/elementary/elm_bubble.c
@@ -15,6 +15,7 @@
15#include "elm_part_helper.h" 15#include "elm_part_helper.h"
16 16
17#define MY_CLASS ELM_BUBBLE_CLASS 17#define MY_CLASS ELM_BUBBLE_CLASS
18#define MY_CLASS_PFX elm_bubble
18 19
19#define MY_CLASS_NAME "Elm_Bubble" 20#define MY_CLASS_NAME "Elm_Bubble"
20#define MY_CLASS_NAME_LEGACY "elm_bubble" 21#define MY_CLASS_NAME_LEGACY "elm_bubble"
@@ -272,18 +273,6 @@ _elm_bubble_elm_widget_focus_direction_manager_is(Eo *obj EINA_UNUSED, Elm_Bubbl
272 return EINA_TRUE; 273 return EINA_TRUE;
273} 274}
274 275
275EOLIAN static const Elm_Layout_Part_Alias_Description*
276_elm_bubble_elm_layout_text_aliases_get(Eo *obj EINA_UNUSED, Elm_Bubble_Data *_pd EINA_UNUSED)
277{
278 return _text_aliases;
279}
280
281EOLIAN static const Elm_Layout_Part_Alias_Description*
282_elm_bubble_elm_layout_content_aliases_get(Eo *obj EINA_UNUSED, Elm_Bubble_Data *_pd EINA_UNUSED)
283{
284 return _content_aliases;
285}
286
287EOLIAN static void 276EOLIAN static void
288_elm_bubble_class_constructor(Efl_Class *klass) 277_elm_bubble_class_constructor(Efl_Class *klass)
289{ 278{
@@ -296,9 +285,15 @@ ELM_PART_OVERRIDE_TEXT_SET(elm_bubble, ELM_BUBBLE, ELM_LAYOUT, Elm_Bubble_Data,
296 285
297#include "elm_bubble_internal_part.eo.c" 286#include "elm_bubble_internal_part.eo.c"
298/* Efl.Part end */ 287/* Efl.Part end */
288
299/* Internal EO APIs and hidden overrides */ 289/* Internal EO APIs and hidden overrides */
300 290
291ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT()
292ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT()
293
301#define ELM_BUBBLE_EXTRA_OPS \ 294#define ELM_BUBBLE_EXTRA_OPS \
295 ELM_LAYOUT_CONTENT_ALIASES_OPS(), \
296 ELM_LAYOUT_TEXT_ALIASES_OPS(), \
302 EFL_CANVAS_GROUP_ADD_OPS(elm_bubble) 297 EFL_CANVAS_GROUP_ADD_OPS(elm_bubble)
303 298
304#include "elm_bubble.eo.c" 299#include "elm_bubble.eo.c"
diff --git a/src/lib/elementary/elm_bubble.eo b/src/lib/elementary/elm_bubble.eo
index 0fb9557..ff0bd7c 100644
--- a/src/lib/elementary/elm_bubble.eo
+++ b/src/lib/elementary/elm_bubble.eo
@@ -43,8 +43,6 @@ class Elm.Bubble (Elm.Layout, Efl.Ui.Clickable)
43 Elm.Widget.focus_next; 43 Elm.Widget.focus_next;
44 Elm.Widget.focus_direction_manager_is; 44 Elm.Widget.focus_direction_manager_is;
45 Elm.Widget.access; 45 Elm.Widget.access;
46 Elm.Layout.text_aliases { get; }
47 Elm.Layout.content_aliases { get; }
48 Elm.Layout.sizing_eval; 46 Elm.Layout.sizing_eval;
49 Efl.Part.part; 47 Efl.Part.part;
50 } 48 }
diff --git a/src/lib/elementary/elm_conform.c b/src/lib/elementary/elm_conform.c
index 5539632..d2f55c3 100644
--- a/src/lib/elementary/elm_conform.c
+++ b/src/lib/elementary/elm_conform.c
@@ -12,7 +12,7 @@
12#include "elm_widget_layout.h" 12#include "elm_widget_layout.h"
13 13
14#define MY_CLASS ELM_CONFORMANT_CLASS 14#define MY_CLASS ELM_CONFORMANT_CLASS
15 15#define MY_CLASS_PFX elm_conformant
16#define MY_CLASS_NAME "Elm_Conformant" 16#define MY_CLASS_NAME "Elm_Conformant"
17#define MY_CLASS_NAME_LEGACY "elm_conformant" 17#define MY_CLASS_NAME_LEGACY "elm_conformant"
18 18
@@ -986,12 +986,6 @@ _elm_conformant_elm_widget_widget_parent_set(Eo *obj, Elm_Conformant_Data *sd, E
986#endif 986#endif
987} 987}
988 988
989EOLIAN static const Elm_Layout_Part_Alias_Description*
990_elm_conformant_elm_layout_content_aliases_get(Eo *obj EINA_UNUSED, Elm_Conformant_Data *_pd EINA_UNUSED)
991{
992 return _content_aliases;
993}
994
995EAPI Evas_Object * 989EAPI Evas_Object *
996elm_conformant_add(Evas_Object *parent) 990elm_conformant_add(Evas_Object *parent)
997{ 991{
@@ -1032,7 +1026,10 @@ _elm_conformant_class_constructor(Efl_Class *klass)
1032 1026
1033/* Internal EO APIs and hidden overrides */ 1027/* Internal EO APIs and hidden overrides */
1034 1028
1029ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT()
1030
1035#define ELM_CONFORMANT_EXTRA_OPS \ 1031#define ELM_CONFORMANT_EXTRA_OPS \
1032 ELM_LAYOUT_CONTENT_ALIASES_OPS(), \
1036 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_conformant) 1033 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_conformant)
1037 1034
1038#include "elm_conformant.eo.c" 1035#include "elm_conformant.eo.c"
diff --git a/src/lib/elementary/elm_conformant.eo b/src/lib/elementary/elm_conformant.eo
index 142c8f6..fecbb63 100644
--- a/src/lib/elementary/elm_conformant.eo
+++ b/src/lib/elementary/elm_conformant.eo
@@ -9,7 +9,6 @@ class Elm.Conformant (Elm.Layout)
9 Efl.Object.constructor; 9 Efl.Object.constructor;
10 Elm.Widget.widget_parent { set; } 10 Elm.Widget.widget_parent { set; }
11 Elm.Widget.theme_apply; 11 Elm.Widget.theme_apply;
12 Elm.Layout.content_aliases { get; }
13 } 12 }
14 events { 13 events {
15 virtualkeypad,state,on; [[Called when virtualkeypad was enabled]] 14 virtualkeypad,state,on; [[Called when virtualkeypad was enabled]]
diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index 446d781..09de69e 100644
--- a/src/lib/elementary/elm_entry.c
+++ b/src/lib/elementary/elm_entry.c
@@ -17,6 +17,7 @@
17#include "elm_hoversel.eo.h" 17#include "elm_hoversel.eo.h"
18 18
19#define MY_CLASS ELM_ENTRY_CLASS 19#define MY_CLASS ELM_ENTRY_CLASS
20#define MY_CLASS_PFX elm_entry
20 21
21#define MY_CLASS_NAME "Elm_Entry" 22#define MY_CLASS_NAME "Elm_Entry"
22#define MY_CLASS_NAME_LEGACY "elm_entry" 23#define MY_CLASS_NAME_LEGACY "elm_entry"
@@ -4009,18 +4010,6 @@ _elm_entry_efl_canvas_group_group_member_add(Eo *obj, Elm_Entry_Data *sd, Evas_O
4009 evas_object_raise(sd->hit_rect); 4010 evas_object_raise(sd->hit_rect);
4010} 4011}
4011 4012
4012EOLIAN static const Elm_Layout_Part_Alias_Description*
4013_elm_entry_elm_layout_text_aliases_get(Eo *obj EINA_UNUSED, Elm_Entry_Data *_sd EINA_UNUSED)
4014{
4015 return _text_aliases;
4016}
4017
4018EOLIAN static const Elm_Layout_Part_Alias_Description *
4019_elm_entry_elm_layout_content_aliases_get(Eo *obj EINA_UNUSED, Elm_Entry_Data *sd EINA_UNUSED)
4020{
4021 return _content_aliases;
4022}
4023
4024EOLIAN static Eina_Bool 4013EOLIAN static Eina_Bool
4025_elm_entry_elm_layout_theme_enable(Eo *obj EINA_UNUSED, Elm_Entry_Data *sd EINA_UNUSED) 4014_elm_entry_elm_layout_theme_enable(Eo *obj EINA_UNUSED, Elm_Entry_Data *sd EINA_UNUSED)
4026{ 4015{
@@ -6081,8 +6070,13 @@ ELM_PART_CONTENT_DEFAULT_SET(elm_entry, "icon")
6081 6070
6082/* Internal EO APIs and hidden overrides */ 6071/* Internal EO APIs and hidden overrides */
6083 6072
6073ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT()
6074ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT()
6075
6084#define ELM_ENTRY_EXTRA_OPS \ 6076#define ELM_ENTRY_EXTRA_OPS \
6085 ELM_PART_CONTENT_DEFAULT_OPS(elm_entry), \ 6077 ELM_PART_CONTENT_DEFAULT_OPS(elm_entry), \
6086 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_entry) 6078 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_entry), \
6079 ELM_LAYOUT_CONTENT_ALIASES_OPS(), \
6080 ELM_LAYOUT_TEXT_ALIASES_OPS()
6087 6081
6088#include "elm_entry.eo.c" 6082#include "elm_entry.eo.c"
diff --git a/src/lib/elementary/elm_entry.eo b/src/lib/elementary/elm_entry.eo
index 31753d9..3eb3b35 100644
--- a/src/lib/elementary/elm_entry.eo
+++ b/src/lib/elementary/elm_entry.eo
@@ -967,8 +967,6 @@ class Elm.Entry (Elm.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
967 Elm.Layout.signal_callback_add; 967 Elm.Layout.signal_callback_add;
968 Elm.Layout.signal_callback_del; 968 Elm.Layout.signal_callback_del;
969 Elm.Layout.signal_emit; 969 Elm.Layout.signal_emit;
970 Elm.Layout.text_aliases { get; }
971 Elm.Layout.content_aliases { get; }
972 Elm.Interface_Scrollable.policy { set; } 970 Elm.Interface_Scrollable.policy { set; }
973 Elm.Interface_Scrollable.bounce_allow { set; } 971 Elm.Interface_Scrollable.bounce_allow { set; }
974 Elm.Interface.Atspi_Accessible.state_set { get; } 972 Elm.Interface.Atspi_Accessible.state_set { get; }
diff --git a/src/lib/elementary/elm_hover.c b/src/lib/elementary/elm_hover.c
index 6a150d2..5d944e6 100644
--- a/src/lib/elementary/elm_hover.c
+++ b/src/lib/elementary/elm_hover.c
@@ -16,6 +16,7 @@
16#include "elm_part_helper.h" 16#include "elm_part_helper.h"
17 17
18#define MY_CLASS ELM_HOVER_CLASS 18#define MY_CLASS ELM_HOVER_CLASS
19#define MY_CLASS_PFX elm_hover
19 20
20#define MY_CLASS_NAME "Elm_Hover" 21#define MY_CLASS_NAME "Elm_Hover"
21#define MY_CLASS_NAME_LEGACY "elm_hover" 22#define MY_CLASS_NAME_LEGACY "elm_hover"
@@ -679,8 +680,8 @@ _elm_hover_efl_gfx_visible_set(Eo *obj, Elm_Hover_Data *pd, Eina_Bool vis)
679 } 680 }
680} 681}
681 682
682EOLIAN static const Elm_Layout_Part_Alias_Description* 683static const Elm_Layout_Part_Alias_Description*
683_elm_hover_elm_layout_content_aliases_get(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED) 684_elm_hover_content_aliases_get(Eo *obj, void *_pd EINA_UNUSED)
684{ 685{
685 const char *style = elm_widget_style_get(obj); 686 const char *style = elm_widget_style_get(obj);
686 687
@@ -901,7 +902,11 @@ ELM_PART_OVERRIDE_CONTENT_UNSET(elm_hover, ELM_HOVER, ELM_LAYOUT, Elm_Hover_Data
901 902
902/* Internal EO APIs and hidden overrides */ 903/* Internal EO APIs and hidden overrides */
903 904
905// ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT() is overridden with an if()
906// ELM_LAYOUT_CONTENT_ALIASES_OPS() somehow doesn't compile!?
907
904#define ELM_HOVER_EXTRA_OPS \ 908#define ELM_HOVER_EXTRA_OPS \
905 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_hover) 909 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_hover), \
910 _ELM_LAYOUT_ALIASES_OPS(elm_hover, content)
906 911
907#include "elm_hover.eo.c" 912#include "elm_hover.eo.c"
diff --git a/src/lib/elementary/elm_hover.eo b/src/lib/elementary/elm_hover.eo
index 8321a38..3fd9f02 100644
--- a/src/lib/elementary/elm_hover.eo
+++ b/src/lib/elementary/elm_hover.eo
@@ -72,7 +72,6 @@ class Elm.Hover (Elm.Layout, Efl.Ui.Clickable, Elm.Interface.Atspi_Widget_Action
72 Elm.Widget.sub_object_del; 72 Elm.Widget.sub_object_del;
73 Elm.Widget.focus_manager_factory; 73 Elm.Widget.focus_manager_factory;
74 Elm.Layout.sizing_eval; 74 Elm.Layout.sizing_eval;
75 Elm.Layout.content_aliases { get; }
76 Elm.Interface.Atspi_Widget_Action.elm_actions { get; } 75 Elm.Interface.Atspi_Widget_Action.elm_actions { get; }
77 Efl.Part.part; 76 Efl.Part.part;
78 } 77 }
diff --git a/src/lib/elementary/elm_inwin.c b/src/lib/elementary/elm_inwin.c
index c60166b..05cdbea 100644
--- a/src/lib/elementary/elm_inwin.c
+++ b/src/lib/elementary/elm_inwin.c
@@ -14,6 +14,7 @@
14#include "elm_widget_layout.h" 14#include "elm_widget_layout.h"
15 15
16#define MY_CLASS ELM_INWIN_CLASS 16#define MY_CLASS ELM_INWIN_CLASS
17#define MY_CLASS_PFX elm_inwin
17 18
18#define MY_CLASS_NAME "Elm_Inwin" 19#define MY_CLASS_NAME "Elm_Inwin"
19#define MY_CLASS_NAME_LEGACY "elm_inwin" 20#define MY_CLASS_NAME_LEGACY "elm_inwin"
@@ -94,12 +95,6 @@ _elm_inwin_elm_widget_widget_parent_set(Eo *obj, Elm_Inwin_Data *pd EINA_UNUSED,
94 elm_layout_sizing_eval(obj); 95 elm_layout_sizing_eval(obj);
95} 96}
96 97
97EOLIAN static const Elm_Layout_Part_Alias_Description*
98_elm_inwin_elm_layout_content_aliases_get(Eo *obj EINA_UNUSED, Elm_Inwin_Data *pd EINA_UNUSED)
99{
100 return _content_aliases;
101}
102
103EAPI Evas_Object * 98EAPI Evas_Object *
104elm_win_inwin_add(Evas_Object *parent) 99elm_win_inwin_add(Evas_Object *parent)
105{ 100{
@@ -223,7 +218,10 @@ _elm_inwin_class_constructor(Efl_Class *klass)
223 218
224/* Internal EO APIs and hidden overrides */ 219/* Internal EO APIs and hidden overrides */
225 220
221ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT()
222
226#define ELM_INWIN_EXTRA_OPS \ 223#define ELM_INWIN_EXTRA_OPS \
227 EFL_CANVAS_GROUP_ADD_OPS(elm_inwin) 224 EFL_CANVAS_GROUP_ADD_OPS(elm_inwin), \
225 ELM_LAYOUT_CONTENT_ALIASES_OPS()
228 226
229#include "elm_inwin.eo.c" 227#include "elm_inwin.eo.c"
diff --git a/src/lib/elementary/elm_inwin.eo b/src/lib/elementary/elm_inwin.eo
index 0a1e2b6..c8a8bbf 100644
--- a/src/lib/elementary/elm_inwin.eo
+++ b/src/lib/elementary/elm_inwin.eo
@@ -25,7 +25,6 @@ class Elm.Inwin (Elm.Layout, Efl.Ui.Focus.Manager)
25 Elm.Widget.focus_next_manager_is; 25 Elm.Widget.focus_next_manager_is;
26 Elm.Widget.focus_next; 26 Elm.Widget.focus_next;
27 Elm.Widget.focus_manager_factory; 27 Elm.Widget.focus_manager_factory;
28 Elm.Layout.content_aliases { get; }
29 Elm.Layout.sizing_eval; 28 Elm.Layout.sizing_eval;
30 Efl.Gfx.visible { set; } 29 Efl.Gfx.visible { set; }
31 Efl.Ui.Focus.Manager.move; 30 Efl.Ui.Focus.Manager.move;
diff --git a/src/lib/elementary/elm_layout.c b/src/lib/elementary/elm_layout.c
index 64de2e4..c4a3356 100644
--- a/src/lib/elementary/elm_layout.c
+++ b/src/lib/elementary/elm_layout.c
@@ -17,6 +17,7 @@
17#include <Edje_Edit.h> 17#include <Edje_Edit.h>
18 18
19#define MY_CLASS ELM_LAYOUT_CLASS 19#define MY_CLASS ELM_LAYOUT_CLASS
20#define MY_CLASS_PFX elm_layout
20 21
21#define MY_CLASS_NAME "Elm_Layout" 22#define MY_CLASS_NAME "Elm_Layout"
22#define MY_CLASS_NAME_LEGACY "elm_layout" 23#define MY_CLASS_NAME_LEGACY "elm_layout"
@@ -594,18 +595,6 @@ _edje_signal_callback(void *data,
594 esd->func(esd->data, esd->obj, emission, source); 595 esd->func(esd->data, esd->obj, emission, source);
595} 596}
596 597
597EOLIAN static const Elm_Layout_Part_Alias_Description*
598_elm_layout_text_aliases_get(Eo *obj EINA_UNUSED, Elm_Layout_Smart_Data *_pd EINA_UNUSED)
599{
600 return _text_aliases;
601}
602
603EOLIAN static const Elm_Layout_Part_Alias_Description*
604_elm_layout_content_aliases_get(Eo *obj EINA_UNUSED, Elm_Layout_Smart_Data *_pd EINA_UNUSED)
605{
606 return _content_aliases;
607}
608
609EOLIAN static Eina_Bool 598EOLIAN static Eina_Bool
610_elm_layout_sub_object_add_enable(Eo *obj EINA_UNUSED, Elm_Layout_Smart_Data *_pd EINA_UNUSED) 599_elm_layout_sub_object_add_enable(Eo *obj EINA_UNUSED, Elm_Layout_Smart_Data *_pd EINA_UNUSED)
611{ 600{
@@ -626,9 +615,9 @@ _elm_layout_part_aliasing_eval(const Evas_Object *obj,
626 const Elm_Layout_Part_Alias_Description *aliases = NULL; 615 const Elm_Layout_Part_Alias_Description *aliases = NULL;
627 616
628 if (is_text) 617 if (is_text)
629 aliases = elm_obj_layout_text_aliases_get(obj); 618 aliases = elm_layout_text_aliases_get(obj);
630 else 619 else
631 aliases = elm_obj_layout_content_aliases_get(obj); 620 aliases = elm_layout_content_aliases_get(obj);
632 621
633 while (aliases && aliases->alias && aliases->real_part) 622 while (aliases && aliases->alias && aliases->real_part)
634 { 623 {
@@ -2415,10 +2404,18 @@ ELM_PART_IMPLEMENT_TEXT_GET(elm_layout, ELM_LAYOUT, Elm_Layout_Smart_Data, Elm_P
2415 2404
2416/* Internal EO APIs and hidden overrides */ 2405/* Internal EO APIs and hidden overrides */
2417 2406
2407EFL_FUNC_BODY_CONST(elm_layout_text_aliases_get, const Elm_Layout_Part_Alias_Description *, NULL)
2408EFL_FUNC_BODY_CONST(elm_layout_content_aliases_get, const Elm_Layout_Part_Alias_Description *, NULL)
2409
2410ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT()
2411ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT()
2412
2418#define ELM_LAYOUT_EXTRA_OPS \ 2413#define ELM_LAYOUT_EXTRA_OPS \
2419 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_layout), \ 2414 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_layout), \
2420 ELM_PART_CONTENT_DEFAULT_OPS(elm_layout), \ 2415 ELM_PART_CONTENT_DEFAULT_OPS(elm_layout), \
2421 ELM_PART_TEXT_DEFAULT_OPS(elm_layout), \ 2416 ELM_PART_TEXT_DEFAULT_OPS(elm_layout), \
2417 ELM_LAYOUT_CONTENT_ALIASES_OPS(), \
2418 ELM_LAYOUT_TEXT_ALIASES_OPS(), \
2422 EFL_OBJECT_OP_FUNC(efl_dbg_info_get, _elm_layout_efl_object_dbg_info_get) 2419 EFL_OBJECT_OP_FUNC(efl_dbg_info_get, _elm_layout_efl_object_dbg_info_get)
2423 2420
2424#include "elm_layout.eo.c" 2421#include "elm_layout.eo.c"
diff --git a/src/lib/elementary/elm_layout.eo b/src/lib/elementary/elm_layout.eo
index 48ce1d5..b03518d 100644
--- a/src/lib/elementary/elm_layout.eo
+++ b/src/lib/elementary/elm_layout.eo
@@ -65,24 +65,6 @@ class Elm.Layout (Elm.Widget, Efl.Part, Efl.Container, Efl.File,
65 style: string; [[The style to used.]] 65 style: string; [[The style to used.]]
66 } 66 }
67 } 67 }
68 @property text_aliases @protected {
69 [[Text aliases property]]
70 get {
71 legacy: null;
72 }
73 values {
74 aliases: ptr(const(Elm.Layout_Part_Alias_Description)); [[Text aliases]]
75 }
76 }
77 @property content_aliases @protected {
78 [[Content aliases property]]
79 get {
80 legacy: null;
81 }
82 values {
83 aliases: ptr(const(Elm.Layout_Part_Alias_Description)); [[Content aliases]]
84 }
85 }
86 @property edje { 68 @property edje {
87 get { 69 get {
88 [[Get the edje layout 70 [[Get the edje layout
diff --git a/src/lib/elementary/elm_panes.c b/src/lib/elementary/elm_panes.c
index 7879e1c..45650de 100644
--- a/src/lib/elementary/elm_panes.c
+++ b/src/lib/elementary/elm_panes.c
@@ -12,6 +12,7 @@
12#include "elm_widget_panes.h" 12#include "elm_widget_panes.h"
13 13
14#define MY_CLASS ELM_PANES_CLASS 14#define MY_CLASS ELM_PANES_CLASS
15#define MY_CLASS_PFX elm_panes
15 16
16#define MY_CLASS_NAME "Elm_Panes" 17#define MY_CLASS_NAME "Elm_Panes"
17#define MY_CLASS_NAME_LEGACY "elm_panes" 18#define MY_CLASS_NAME_LEGACY "elm_panes"
@@ -546,12 +547,6 @@ _elm_panes_elm_widget_focus_next_manager_is(Eo *obj EINA_UNUSED, Elm_Panes_Data
546 return EINA_TRUE; 547 return EINA_TRUE;
547} 548}
548 549
549EOLIAN static const Elm_Layout_Part_Alias_Description*
550_elm_panes_elm_layout_content_aliases_get(Eo *obj EINA_UNUSED, Elm_Panes_Data *_pd EINA_UNUSED)
551{
552 return _content_aliases;
553}
554
555static void 550static void
556_elm_panes_class_constructor(Efl_Class *klass) 551_elm_panes_class_constructor(Efl_Class *klass)
557{ 552{
@@ -560,7 +555,10 @@ _elm_panes_class_constructor(Efl_Class *klass)
560 555
561/* Internal EO APIs and hidden overrides */ 556/* Internal EO APIs and hidden overrides */
562 557
558ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT()
559
563#define ELM_PANES_EXTRA_OPS \ 560#define ELM_PANES_EXTRA_OPS \
564 EFL_CANVAS_GROUP_ADD_OPS(elm_panes) 561 EFL_CANVAS_GROUP_ADD_OPS(elm_panes), \
562 ELM_LAYOUT_CONTENT_ALIASES_OPS()
565 563
566#include "elm_panes.eo.c" 564#include "elm_panes.eo.c"
diff --git a/src/lib/elementary/elm_panes.eo b/src/lib/elementary/elm_panes.eo
index 309140b..4e29919 100644
--- a/src/lib/elementary/elm_panes.eo
+++ b/src/lib/elementary/elm_panes.eo
@@ -121,7 +121,6 @@ class Elm.Panes (Elm.Layout, Efl.Orientation,
121 Elm.Widget.focus_next_manager_is; 121 Elm.Widget.focus_next_manager_is;
122 Elm.Widget.focus_next; 122 Elm.Widget.focus_next;
123 Elm.Widget.theme_apply; 123 Elm.Widget.theme_apply;
124 Elm.Layout.content_aliases { get; }
125 Efl.Orientation.orientation { get; set; } 124 Efl.Orientation.orientation { get; set; }
126 } 125 }
127 events { 126 events {
diff --git a/src/lib/elementary/elm_priv.h b/src/lib/elementary/elm_priv.h
index c4aac1a..b2bebed 100644
--- a/src/lib/elementary/elm_priv.h
+++ b/src/lib/elementary/elm_priv.h
@@ -610,4 +610,24 @@ void _elm_entry_entry_paste(Evas_Object *obj, const char *entry);
610 610
611double _elm_atof(const char *s); 611double _elm_atof(const char *s);
612 612
613/* Internal EO APIs */
614const Elm_Layout_Part_Alias_Description *elm_layout_content_aliases_get(const Eo *obj);
615const Elm_Layout_Part_Alias_Description *elm_layout_text_aliases_get(const Eo *obj);
616
617#define _ELM_LAYOUT_ALIASES_IMPLEMENT(_pfx, _typ) \
618 static const Elm_Layout_Part_Alias_Description * \
619 _##_pfx##_##_typ##_aliases_get(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED) \
620 { \
621 return _##_typ##_aliases; \
622 }
623
624#define _ELM_LAYOUT_ALIASES_OPS(_pfx, _typ) \
625 EFL_OBJECT_OP_FUNC(elm_layout_##_typ##_aliases_get, _##_pfx##_##_typ##_aliases_get)
626
627#define ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT() _ELM_LAYOUT_ALIASES_IMPLEMENT(MY_CLASS_PFX, content)
628#define ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT() _ELM_LAYOUT_ALIASES_IMPLEMENT(MY_CLASS_PFX, text)
629
630#define ELM_LAYOUT_CONTENT_ALIASES_OPS() _ELM_LAYOUT_ALIASES_OPS(MY_CLASS_PFX, content)
631#define ELM_LAYOUT_TEXT_ALIASES_OPS() _ELM_LAYOUT_ALIASES_OPS(MY_CLASS_PFX, text)
632
613#endif 633#endif