dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

elm: Make content and text aliases internal only 

This removes the APIs from the EO API.

Ref T5315
This commit is contained in:
Jean-Philippe Andre 2017-07-28 15:35:10 +09:00
parent 94d3fd3d82
commit 796d4b138b
33 changed files with 115 additions and 184 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/lib/elementary/efl_ui_button.c
View File

@ -14,6 +14,7 @@
#include "elm_part_helper.h"
#define MY_CLASS EFL_UI_BUTTON_CLASS
#define MY_CLASS_PFX efl_ui_button
#define MY_CLASS_NAME "Efl.Ui.Button"
#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_
CRI("Failed to set layout!");
}
EOLIAN static const Elm_Layout_Part_Alias_Description*
_efl_ui_button_elm_layout_content_aliases_get(Eo *obj EINA_UNUSED, Efl_Ui_Button_Data *_pd EINA_UNUSED)
{
return _content_aliases;
}
EOLIAN static const Elm_Layout_Part_Alias_Description*
_efl_ui_button_elm_layout_text_aliases_get(Eo *obj EINA_UNUSED, Efl_Ui_Button_Data *_pd EINA_UNUSED)
{
return _text_aliases;
}
EAPI Evas_Object *
elm_button_add(Evas_Object *parent)
{
@ -492,7 +481,12 @@ elm_button_autorepeat_get(const Evas_Object *obj)
/* Internal EO APIs and hidden overrides */
ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT()
ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT()
#define EFL_UI_BUTTON_EXTRA_OPS \
ELM_LAYOUT_CONTENT_ALIASES_OPS(), \
ELM_LAYOUT_TEXT_ALIASES_OPS(), \
EFL_CANVAS_GROUP_ADD_OPS(efl_ui_button)
#include "efl_ui_button.eo.c"

2
src/lib/elementary/efl_ui_button.eo
View File

@ -22,8 +22,6 @@ class Efl.Ui.Button (Elm.Layout, Efl.Ui.Clickable, Efl.Ui.Autorepeat, Efl.Text,
Elm.Widget.theme_apply;
Elm.Widget.sub_object_del;
Elm.Widget.widget_event;
Elm.Layout.text_aliases { get; }
Elm.Layout.content_aliases { get; }
Elm.Layout.sizing_eval;
Elm.Interface.Atspi_Widget_Action.elm_actions { get; }
Efl.Part.part;

12
src/lib/elementary/efl_ui_check.c
View File

@ -13,6 +13,7 @@
#include "efl_ui_check_private.h"
#define MY_CLASS EFL_UI_CHECK_CLASS
#define MY_CLASS_PFX efl_ui_check
#define MY_CLASS_NAME "Efl.Ui.Check"
#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
elm_layout_sizing_eval(obj);
}
EOLIAN static const Elm_Layout_Part_Alias_Description*
_efl_ui_check_elm_layout_text_aliases_get(Eo *obj EINA_UNUSED, Efl_Ui_Check_Data *_pd EINA_UNUSED)
{
return _text_aliases;
}
EOLIAN static Eina_Bool
_efl_ui_check_selected_get(Eo *obj, Efl_Ui_Check_Data *pd EINA_UNUSED)
{
@ -433,7 +428,10 @@ _efl_ui_check_class_constructor(Efl_Class *klass)
/* Internal EO APIs and hidden overrides */
ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT()
#define EFL_UI_CHECK_EXTRA_OPS \
EFL_CANVAS_GROUP_ADD_OPS(efl_ui_check)
EFL_CANVAS_GROUP_ADD_OPS(efl_ui_check), \
ELM_LAYOUT_TEXT_ALIASES_OPS()
#include "efl_ui_check.eo.c"

1
src/lib/elementary/efl_ui_check.eo
View File

@ -27,7 +27,6 @@ class Efl.Ui.Check (Efl.Ui.Nstate, Elm.Interface.Atspi_Widget_Action)
Elm.Widget.theme_apply;
Elm.Widget.sub_object_del;
Elm.Widget.widget_event;
Elm.Layout.text_aliases { get; }
Efl.Ui.Nstate.count { set; }
Efl.Ui.Nstate.value { set; }
Elm.Interface.Atspi_Accessible.state_set { get; }

20
src/lib/elementary/efl_ui_frame.c
View File

@ -11,6 +11,7 @@
#include "elm_widget_layout.h"
#define MY_CLASS EFL_UI_FRAME_CLASS
#define MY_CLASS_PFX efl_ui_frame
#define MY_CLASS_NAME "Efl.Ui.Frame"
#define MY_CLASS_NAME_LEGACY "elm_frame"
@ -178,18 +179,6 @@ _efl_ui_frame_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Frame_Data *_pd EINA_UN
elm_layout_sizing_eval(obj);
}
EOLIAN static const Elm_Layout_Part_Alias_Description*
_efl_ui_frame_elm_layout_content_aliases_get(Eo *obj EINA_UNUSED, Efl_Ui_Frame_Data *_pd EINA_UNUSED)
{
return _content_aliases;
}
EOLIAN static const Elm_Layout_Part_Alias_Description*
_efl_ui_frame_elm_layout_text_aliases_get(Eo *obj EINA_UNUSED, Efl_Ui_Frame_Data *_pd EINA_UNUSED)
{
return _text_aliases;
}
EAPI Evas_Object *
elm_frame_add(Evas_Object *parent)
{
@ -280,7 +269,12 @@ _efl_ui_frame_class_constructor(Efl_Class *klass)
/* Internal EO APIs and hidden overrides */
ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT()
ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT()
#define EFL_UI_FRAME_EXTRA_OPS \
EFL_CANVAS_GROUP_ADD_OPS(efl_ui_frame)
EFL_CANVAS_GROUP_ADD_OPS(efl_ui_frame), \
ELM_LAYOUT_CONTENT_ALIASES_OPS(), \
ELM_LAYOUT_TEXT_ALIASES_OPS()
#include "efl_ui_frame.eo.c"

2
src/lib/elementary/efl_ui_frame.eo
View File

@ -60,8 +60,6 @@ class Efl.Ui.Frame (Elm.Layout, Efl.Ui.Clickable, Efl.Text)
Elm.Widget.focus_next_manager_is;
Elm.Widget.focus_next;
Elm.Widget.focus_direction_manager_is;
Elm.Layout.text_aliases { get; }
Elm.Layout.content_aliases { get; }
Efl.Text.text { get; set; }
}
}

18
src/lib/elementary/efl_ui_progressbar.c
View File

@ -15,6 +15,7 @@
#include "elm_part_helper.h"
#define MY_CLASS EFL_UI_PROGRESSBAR_CLASS
#define MY_CLASS_PFX efl_ui_progressbar
#define MY_CLASS_NAME "Efl.Ui.Progressbar"
#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
efl_canvas_group_del(efl_super(obj, MY_CLASS));
}
EOLIAN static const Elm_Layout_Part_Alias_Description*
_efl_ui_progressbar_elm_layout_text_aliases_get(Eo *obj EINA_UNUSED, Efl_Ui_Progressbar_Data *_pd EINA_UNUSED)
{
return _text_aliases;
}
EOLIAN static const Elm_Layout_Part_Alias_Description*
_efl_ui_progressbar_elm_layout_content_aliases_get(Eo *obj EINA_UNUSED, Efl_Ui_Progressbar_Data *_pd EINA_UNUSED)
{
return _content_aliases;
}
EAPI Evas_Object *
elm_progressbar_add(Evas_Object *parent)
{
@ -691,7 +680,12 @@ _efl_ui_progressbar_internal_part_efl_ui_range_range_value_get(Eo *obj, Elm_Part
/* Internal EO APIs and hidden overrides */
ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT()
ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT()
#define EFL_UI_PROGRESSBAR_EXTRA_OPS \
ELM_LAYOUT_CONTENT_ALIASES_OPS(), \
ELM_LAYOUT_TEXT_ALIASES_OPS(), \
EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_progressbar)
#include "efl_ui_progressbar.eo.c"

2
src/lib/elementary/efl_ui_progressbar.eo
View File

@ -54,8 +54,6 @@ class Efl.Ui.Progressbar (Elm.Layout, Efl.Ui.Range,
Elm.Widget.focus_next_manager_is;
Elm.Widget.focus_direction_manager_is;
Elm.Widget.sub_object_del;
Elm.Layout.text_aliases { get; }
Elm.Layout.content_aliases { get; }
Elm.Layout.sizing_eval;
Efl.Ui.Range.span_size { get; set; }
Efl.Ui.Range.range_value { get; set; }

12
src/lib/elementary/efl_ui_radio.c
View File

@ -13,6 +13,7 @@
#include "elm_widget_layout.h"
#define MY_CLASS EFL_UI_RADIO_CLASS
#define MY_CLASS_PFX efl_ui_radio
#define MY_CLASS_NAME "Efl.Ui.Radio"
#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)
efl_canvas_group_del(efl_super(obj, EFL_UI_CHECK_CLASS));
}
EOLIAN static const Elm_Layout_Part_Alias_Description*
_efl_ui_radio_elm_layout_text_aliases_get(Eo *obj EINA_UNUSED, Efl_Ui_Radio_Data *_pd EINA_UNUSED)
{
return _text_aliases;
}
EAPI Evas_Object *
elm_radio_add(Evas_Object *parent)
{
@ -406,7 +401,10 @@ _efl_ui_radio_elm_interface_atspi_accessible_state_set_get(Eo *obj, Efl_Ui_Radio
/* Internal EO APIs and hidden overrides */
ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT()
#define EFL_UI_RADIO_EXTRA_OPS \
EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_radio)
EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_radio), \
ELM_LAYOUT_TEXT_ALIASES_OPS()
#include "efl_ui_radio.eo.c"

1
src/lib/elementary/efl_ui_radio.eo
View File

@ -80,7 +80,6 @@ class Efl.Ui.Radio (Efl.Ui.Check, Elm.Interface.Atspi_Widget_Action)
Elm.Widget.theme_apply;
Elm.Widget.activate;
Elm.Widget.widget_event;
Elm.Layout.text_aliases { get; }
Elm.Interface.Atspi_Accessible.state_set { get; }
Elm.Interface.Atspi_Widget_Action.elm_actions { get; }
}

18
src/lib/elementary/efl_ui_slider.c
View File

@ -17,6 +17,7 @@
#include "elm_part_helper.h"
#define MY_CLASS EFL_UI_SLIDER_CLASS
#define MY_CLASS_PFX efl_ui_slider
#define MY_CLASS_NAME "Efl.Ui.Slider"
#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)
efl_canvas_group_del(efl_super(obj, MY_CLASS));
}
EOLIAN static const Elm_Layout_Part_Alias_Description*
_efl_ui_slider_elm_layout_text_aliases_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *_pd EINA_UNUSED)
{
return _text_aliases;
}
EOLIAN static const Elm_Layout_Part_Alias_Description*
_efl_ui_slider_elm_layout_content_aliases_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *_pd EINA_UNUSED)
{
return _content_aliases;
}
EOLIAN static Eina_Bool
_efl_ui_slider_efl_ui_range_range_interval_enabled_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *pd)
{
@ -1793,7 +1782,12 @@ elm_slider_min_max_get(const Evas_Object *obj, double *min, double *max)
/* Internal EO APIs and hidden overrides */
ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT()
ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT()
#define EFL_UI_SLIDER_EXTRA_OPS \
ELM_LAYOUT_CONTENT_ALIASES_OPS(), \
ELM_LAYOUT_TEXT_ALIASES_OPS(), \
EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_slider)
#include "efl_ui_slider.eo.c"

2
src/lib/elementary/efl_ui_slider.eo
View File

@ -122,8 +122,6 @@ class Efl.Ui.Slider (Elm.Layout, Efl.Ui.Range,
Elm.Widget.focus_direction_manager_is;
Elm.Widget.on_focus;
Elm.Widget.widget_event;
Elm.Layout.text_aliases { get; }
Elm.Layout.content_aliases { get; }
Elm.Layout.sizing_eval;
Efl.Ui.Range.span_size { get; set; }
Efl.Ui.Range.range_value { get; set; }

12
src/lib/elementary/efl_ui_text.c
View File

@ -178,6 +178,7 @@ struct _Efl_Ui_Text_Rectangle
};
#define MY_CLASS EFL_UI_TEXT_CLASS
#define MY_CLASS_PFX efl_ui_text
#define MY_CLASS_NAME "Efl.Ui.Text"
#define MY_CLASS_NAME_LEGACY "elm_entry"
@ -3327,12 +3328,6 @@ _efl_ui_text_efl_canvas_group_group_member_add(Eo *obj, Efl_Ui_Text_Data *sd, Ev
evas_object_raise(sd->hit_rect);
}
EOLIAN static const Elm_Layout_Part_Alias_Description *
_efl_ui_text_elm_layout_content_aliases_get(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd EINA_UNUSED)
{
return _content_aliases;
}
EOLIAN static Eina_Bool
_efl_ui_text_elm_layout_theme_enable(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd EINA_UNUSED)
{
@ -5372,8 +5367,11 @@ ELM_PART_OVERRIDE_CONTENT_UNSET(elm_entry, EFL_UI_TEXT, ELM_LAYOUT, Efl_Ui_Text_
/* Internal EO APIs and hidden overrides */
ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT()
#define EFL_UI_TEXT_EXTRA_OPS \
EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_text)
EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_text), \
ELM_LAYOUT_CONTENT_ALIASES_OPS()
#include "efl_ui_text.eo.c"

1
src/lib/elementary/efl_ui_text.eo
View File

@ -417,7 +417,6 @@ class Efl.Ui.Text (Elm.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
Elm.Layout.signal_callback_add;
Elm.Layout.signal_callback_del;
Elm.Layout.signal_emit;
Elm.Layout.content_aliases { get; }
Elm.Interface_Scrollable.policy { set; }
Elm.Interface_Scrollable.bounce_allow { set; }
Elm.Interface.Atspi_Accessible.state_set { get; }

10
src/lib/elementary/elm_actionslider.c
View File

@ -17,6 +17,7 @@
#include "elm_part_helper.h"
#define MY_CLASS ELM_ACTIONSLIDER_CLASS
#define MY_CLASS_FPX elm_actionslider
#define MY_CLASS_NAME "Elm_Actionslider"
#define MY_CLASS_NAME_LEGACY "elm_actionslider"
@ -534,12 +535,6 @@ _elm_actionslider_efl_canvas_group_group_add(Eo *obj, Elm_Actionslider_Data *pri
elm_layout_sizing_eval(obj);
}
EOLIAN static const Elm_Layout_Part_Alias_Description*
_elm_actionslider_elm_layout_text_aliases_get(Eo *obj EINA_UNUSED, Elm_Actionslider_Data *_pd EINA_UNUSED)
{
return _text_aliases;
}
EAPI Evas_Object *
elm_actionslider_add(Evas_Object *parent)
{
@ -673,7 +668,10 @@ ELM_PART_OVERRIDE_TEXT_GET(elm_actionslider, ELM_ACTIONSLIDER, ELM_LAYOUT, Elm_A
/* Internal EO APIs and hidden overrides */
ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT()
#define ELM_ACTIONSLIDER_EXTRA_OPS \
ELM_LAYOUT_TEXT_ALIASES_OPS(), \
EFL_CANVAS_GROUP_ADD_OPS(elm_actionslider)
#include "elm_actionslider.eo.c"

1
src/lib/elementary/elm_actionslider.eo
View File

@ -74,7 +74,6 @@ class Elm.Actionslider (Elm.Layout, Efl.Ui.Selectable)
Elm.Widget.focus_next_manager_is;
Elm.Widget.focus_direction_manager_is;
Elm.Widget.theme_apply;
Elm.Layout.text_aliases { get; }
Elm.Layout.sizing_eval;
Efl.Part.part;
}

10
src/lib/elementary/elm_bg.c
View File

@ -11,6 +11,7 @@
#include "elm_widget_layout.h"
#define MY_CLASS ELM_BG_CLASS
#define MY_CLASS_PFX elm_bg
#define MY_CLASS_NAME "Elm_Bg"
#define MY_CLASS_NAME_LEGACY "elm_bg"
@ -104,12 +105,6 @@ _elm_bg_efl_canvas_group_group_add(Eo *obj, Elm_Bg_Data *priv)
CRI("Failed to set layout!");
}
EOLIAN static const Elm_Layout_Part_Alias_Description*
_elm_bg_elm_layout_content_aliases_get(Eo *obj EINA_UNUSED, Elm_Bg_Data *_pd EINA_UNUSED)
{
return _content_aliases;
}
EAPI Evas_Object *
elm_bg_add(Evas_Object *parent)
{
@ -287,7 +282,10 @@ elm_bg_file_get(const Eo *obj, const char **file, const char **group)
/* Internal EO APIs and hidden overrides */
ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT()
#define ELM_BG_EXTRA_OPS \
ELM_LAYOUT_CONTENT_ALIASES_OPS(), \
EFL_CANVAS_GROUP_ADD_OPS(elm_bg)
#include "elm_bg.eo.c"

1
src/lib/elementary/elm_bg.eo
View File

@ -96,7 +96,6 @@ class Elm.Bg (Elm.Layout, Efl.File)
implements {
class.constructor;
Efl.Object.constructor;
Elm.Layout.content_aliases { get; }
Elm.Layout.sizing_eval;
Efl.File.file { get; set; }
}

19
src/lib/elementary/elm_bubble.c
View File

@ -15,6 +15,7 @@
#include "elm_part_helper.h"
#define MY_CLASS ELM_BUBBLE_CLASS
#define MY_CLASS_PFX elm_bubble
#define MY_CLASS_NAME "Elm_Bubble"
#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
return EINA_TRUE;
}
EOLIAN static const Elm_Layout_Part_Alias_Description*
_elm_bubble_elm_layout_text_aliases_get(Eo *obj EINA_UNUSED, Elm_Bubble_Data *_pd EINA_UNUSED)
{
return _text_aliases;
}
EOLIAN static const Elm_Layout_Part_Alias_Description*
_elm_bubble_elm_layout_content_aliases_get(Eo *obj EINA_UNUSED, Elm_Bubble_Data *_pd EINA_UNUSED)
{
return _content_aliases;
}
EOLIAN static void
_elm_bubble_class_constructor(Efl_Class *klass)
{
@ -296,9 +285,15 @@ ELM_PART_OVERRIDE_TEXT_SET(elm_bubble, ELM_BUBBLE, ELM_LAYOUT, Elm_Bubble_Data,
#include "elm_bubble_internal_part.eo.c"
/* Efl.Part end */
/* Internal EO APIs and hidden overrides */
ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT()
ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT()
#define ELM_BUBBLE_EXTRA_OPS \
ELM_LAYOUT_CONTENT_ALIASES_OPS(), \
ELM_LAYOUT_TEXT_ALIASES_OPS(), \
EFL_CANVAS_GROUP_ADD_OPS(elm_bubble)
#include "elm_bubble.eo.c"

2
src/lib/elementary/elm_bubble.eo
View File

@ -43,8 +43,6 @@ class Elm.Bubble (Elm.Layout, Efl.Ui.Clickable)
Elm.Widget.focus_next;
Elm.Widget.focus_direction_manager_is;
Elm.Widget.access;
Elm.Layout.text_aliases { get; }
Elm.Layout.content_aliases { get; }
Elm.Layout.sizing_eval;
Efl.Part.part;
}

11
src/lib/elementary/elm_conform.c
View File

@ -12,7 +12,7 @@
#include "elm_widget_layout.h"
#define MY_CLASS ELM_CONFORMANT_CLASS
#define MY_CLASS_PFX elm_conformant
#define MY_CLASS_NAME "Elm_Conformant"
#define MY_CLASS_NAME_LEGACY "elm_conformant"
@ -986,12 +986,6 @@ _elm_conformant_elm_widget_widget_parent_set(Eo *obj, Elm_Conformant_Data *sd, E
#endif
}
EOLIAN static const Elm_Layout_Part_Alias_Description*
_elm_conformant_elm_layout_content_aliases_get(Eo *obj EINA_UNUSED, Elm_Conformant_Data *_pd EINA_UNUSED)
{
return _content_aliases;
}
EAPI Evas_Object *
elm_conformant_add(Evas_Object *parent)
{
@ -1032,7 +1026,10 @@ _elm_conformant_class_constructor(Efl_Class *klass)
/* Internal EO APIs and hidden overrides */
ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT()
#define ELM_CONFORMANT_EXTRA_OPS \
ELM_LAYOUT_CONTENT_ALIASES_OPS(), \
EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_conformant)
#include "elm_conformant.eo.c"

1
src/lib/elementary/elm_conformant.eo
View File

@ -9,7 +9,6 @@ class Elm.Conformant (Elm.Layout)
Efl.Object.constructor;
Elm.Widget.widget_parent { set; }
Elm.Widget.theme_apply;
Elm.Layout.content_aliases { get; }
}
events {
virtualkeypad,state,on; [[Called when virtualkeypad was enabled]]

20
src/lib/elementary/elm_entry.c
View File

@ -17,6 +17,7 @@
#include "elm_hoversel.eo.h"
#define MY_CLASS ELM_ENTRY_CLASS
#define MY_CLASS_PFX elm_entry
#define MY_CLASS_NAME "Elm_Entry"
#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
evas_object_raise(sd->hit_rect);
}
EOLIAN static const Elm_Layout_Part_Alias_Description*
_elm_entry_elm_layout_text_aliases_get(Eo *obj EINA_UNUSED, Elm_Entry_Data *_sd EINA_UNUSED)
{
return _text_aliases;
}
EOLIAN static const Elm_Layout_Part_Alias_Description *
_elm_entry_elm_layout_content_aliases_get(Eo *obj EINA_UNUSED, Elm_Entry_Data *sd EINA_UNUSED)
{
return _content_aliases;
}
EOLIAN static Eina_Bool
_elm_entry_elm_layout_theme_enable(Eo *obj EINA_UNUSED, Elm_Entry_Data *sd EINA_UNUSED)
{
@ -6081,8 +6070,13 @@ ELM_PART_CONTENT_DEFAULT_SET(elm_entry, "icon")
/* Internal EO APIs and hidden overrides */
ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT()
ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT()
#define ELM_ENTRY_EXTRA_OPS \
ELM_PART_CONTENT_DEFAULT_OPS(elm_entry), \
EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_entry)
EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_entry), \
ELM_LAYOUT_CONTENT_ALIASES_OPS(), \
ELM_LAYOUT_TEXT_ALIASES_OPS()
#include "elm_entry.eo.c"

2
src/lib/elementary/elm_entry.eo
View File

@ -967,8 +967,6 @@ class Elm.Entry (Elm.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
Elm.Layout.signal_callback_add;
Elm.Layout.signal_callback_del;
Elm.Layout.signal_emit;
Elm.Layout.text_aliases { get; }
Elm.Layout.content_aliases { get; }
Elm.Interface_Scrollable.policy { set; }
Elm.Interface_Scrollable.bounce_allow { set; }
Elm.Interface.Atspi_Accessible.state_set { get; }

11
src/lib/elementary/elm_hover.c
View File

@ -16,6 +16,7 @@
#include "elm_part_helper.h"
#define MY_CLASS ELM_HOVER_CLASS
#define MY_CLASS_PFX elm_hover
#define MY_CLASS_NAME "Elm_Hover"
#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)
}
}
EOLIAN static const Elm_Layout_Part_Alias_Description*
_elm_hover_elm_layout_content_aliases_get(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED)
static const Elm_Layout_Part_Alias_Description*
_elm_hover_content_aliases_get(Eo *obj, void *_pd EINA_UNUSED)
{
const char *style = elm_widget_style_get(obj);
@ -901,7 +902,11 @@ ELM_PART_OVERRIDE_CONTENT_UNSET(elm_hover, ELM_HOVER, ELM_LAYOUT, Elm_Hover_Data
/* Internal EO APIs and hidden overrides */
// ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT() is overridden with an if()
// ELM_LAYOUT_CONTENT_ALIASES_OPS() somehow doesn't compile!?
#define ELM_HOVER_EXTRA_OPS \
EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_hover)
EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_hover), \
_ELM_LAYOUT_ALIASES_OPS(elm_hover, content)
#include "elm_hover.eo.c"

1
src/lib/elementary/elm_hover.eo
View File

@ -72,7 +72,6 @@ class Elm.Hover (Elm.Layout, Efl.Ui.Clickable, Elm.Interface.Atspi_Widget_Action
Elm.Widget.sub_object_del;
Elm.Widget.focus_manager_factory;
Elm.Layout.sizing_eval;
Elm.Layout.content_aliases { get; }
Elm.Interface.Atspi_Widget_Action.elm_actions { get; }
Efl.Part.part;
}

12
src/lib/elementary/elm_inwin.c
View File

@ -14,6 +14,7 @@
#include "elm_widget_layout.h"
#define MY_CLASS ELM_INWIN_CLASS
#define MY_CLASS_PFX elm_inwin
#define MY_CLASS_NAME "Elm_Inwin"
#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,
elm_layout_sizing_eval(obj);
}
EOLIAN static const Elm_Layout_Part_Alias_Description*
_elm_inwin_elm_layout_content_aliases_get(Eo *obj EINA_UNUSED, Elm_Inwin_Data *pd EINA_UNUSED)
{
return _content_aliases;
}
EAPI Evas_Object *
elm_win_inwin_add(Evas_Object *parent)
{
@ -223,7 +218,10 @@ _elm_inwin_class_constructor(Efl_Class *klass)
/* Internal EO APIs and hidden overrides */
ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT()
#define ELM_INWIN_EXTRA_OPS \
EFL_CANVAS_GROUP_ADD_OPS(elm_inwin)
EFL_CANVAS_GROUP_ADD_OPS(elm_inwin), \
ELM_LAYOUT_CONTENT_ALIASES_OPS()
#include "elm_inwin.eo.c"

1
src/lib/elementary/elm_inwin.eo
View File

@ -25,7 +25,6 @@ class Elm.Inwin (Elm.Layout, Efl.Ui.Focus.Manager)
Elm.Widget.focus_next_manager_is;
Elm.Widget.focus_next;
Elm.Widget.focus_manager_factory;
Elm.Layout.content_aliases { get; }
Elm.Layout.sizing_eval;
Efl.Gfx.visible { set; }
Efl.Ui.Focus.Manager.move;

25
src/lib/elementary/elm_layout.c
View File

@ -17,6 +17,7 @@
#include <Edje_Edit.h>
#define MY_CLASS ELM_LAYOUT_CLASS
#define MY_CLASS_PFX elm_layout
#define MY_CLASS_NAME "Elm_Layout"
#define MY_CLASS_NAME_LEGACY "elm_layout"
@ -594,18 +595,6 @@ _edje_signal_callback(void *data,
esd->func(esd->data, esd->obj, emission, source);
}
EOLIAN static const Elm_Layout_Part_Alias_Description*
_elm_layout_text_aliases_get(Eo *obj EINA_UNUSED, Elm_Layout_Smart_Data *_pd EINA_UNUSED)
{
return _text_aliases;
}
EOLIAN static const Elm_Layout_Part_Alias_Description*
_elm_layout_content_aliases_get(Eo *obj EINA_UNUSED, Elm_Layout_Smart_Data *_pd EINA_UNUSED)
{
return _content_aliases;
}
EOLIAN static Eina_Bool
_elm_layout_sub_object_add_enable(Eo *obj EINA_UNUSED, Elm_Layout_Smart_Data *_pd EINA_UNUSED)
{
@ -626,9 +615,9 @@ _elm_layout_part_aliasing_eval(const Evas_Object *obj,
const Elm_Layout_Part_Alias_Description *aliases = NULL;
if (is_text)
aliases = elm_obj_layout_text_aliases_get(obj);
aliases = elm_layout_text_aliases_get(obj);
else
aliases = elm_obj_layout_content_aliases_get(obj);
aliases = elm_layout_content_aliases_get(obj);
while (aliases && aliases->alias && aliases->real_part)
{
@ -2415,10 +2404,18 @@ ELM_PART_IMPLEMENT_TEXT_GET(elm_layout, ELM_LAYOUT, Elm_Layout_Smart_Data, Elm_P
/* Internal EO APIs and hidden overrides */
EFL_FUNC_BODY_CONST(elm_layout_text_aliases_get, const Elm_Layout_Part_Alias_Description *, NULL)
EFL_FUNC_BODY_CONST(elm_layout_content_aliases_get, const Elm_Layout_Part_Alias_Description *, NULL)
ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT()
ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT()
#define ELM_LAYOUT_EXTRA_OPS \
EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_layout), \
ELM_PART_CONTENT_DEFAULT_OPS(elm_layout), \
ELM_PART_TEXT_DEFAULT_OPS(elm_layout), \
ELM_LAYOUT_CONTENT_ALIASES_OPS(), \
ELM_LAYOUT_TEXT_ALIASES_OPS(), \
EFL_OBJECT_OP_FUNC(efl_dbg_info_get, _elm_layout_efl_object_dbg_info_get)
#include "elm_layout.eo.c"

18
src/lib/elementary/elm_layout.eo
View File

@ -65,24 +65,6 @@ class Elm.Layout (Elm.Widget, Efl.Part, Efl.Container, Efl.File,
style: string; [[The style to used.]]
}
}
@property text_aliases @protected {
[[Text aliases property]]
get {
legacy: null;
}
values {
aliases: ptr(const(Elm.Layout_Part_Alias_Description)); [[Text aliases]]
}
}
@property content_aliases @protected {
[[Content aliases property]]
get {
legacy: null;
}
values {
aliases: ptr(const(Elm.Layout_Part_Alias_Description)); [[Content aliases]]
}
}
@property edje {
get {
[[Get the edje layout

12
src/lib/elementary/elm_panes.c
View File

@ -12,6 +12,7 @@
#include "elm_widget_panes.h"
#define MY_CLASS ELM_PANES_CLASS
#define MY_CLASS_PFX elm_panes
#define MY_CLASS_NAME "Elm_Panes"
#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
return EINA_TRUE;
}
EOLIAN static const Elm_Layout_Part_Alias_Description*
_elm_panes_elm_layout_content_aliases_get(Eo *obj EINA_UNUSED, Elm_Panes_Data *_pd EINA_UNUSED)
{
return _content_aliases;
}
static void
_elm_panes_class_constructor(Efl_Class *klass)
{
@ -560,7 +555,10 @@ _elm_panes_class_constructor(Efl_Class *klass)
/* Internal EO APIs and hidden overrides */
ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT()
#define ELM_PANES_EXTRA_OPS \
EFL_CANVAS_GROUP_ADD_OPS(elm_panes)
EFL_CANVAS_GROUP_ADD_OPS(elm_panes), \
ELM_LAYOUT_CONTENT_ALIASES_OPS()
#include "elm_panes.eo.c"

1
src/lib/elementary/elm_panes.eo
View File

@ -121,7 +121,6 @@ class Elm.Panes (Elm.Layout, Efl.Orientation,
Elm.Widget.focus_next_manager_is;
Elm.Widget.focus_next;
Elm.Widget.theme_apply;
Elm.Layout.content_aliases { get; }
Efl.Orientation.orientation { get; set; }
}
events {

20
src/lib/elementary/elm_priv.h
View File

@ -610,4 +610,24 @@ void _elm_entry_entry_paste(Evas_Object *obj, const char *entry);
double _elm_atof(const char *s);
/* Internal EO APIs */
const Elm_Layout_Part_Alias_Description *elm_layout_content_aliases_get(const Eo *obj);
const Elm_Layout_Part_Alias_Description *elm_layout_text_aliases_get(const Eo *obj);
#define _ELM_LAYOUT_ALIASES_IMPLEMENT(_pfx, _typ) \
static const Elm_Layout_Part_Alias_Description * \
_##_pfx##_##_typ##_aliases_get(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED) \
{ \
return _##_typ##_aliases; \
}
#define _ELM_LAYOUT_ALIASES_OPS(_pfx, _typ) \
EFL_OBJECT_OP_FUNC(elm_layout_##_typ##_aliases_get, _##_pfx##_##_typ##_aliases_get)
#define ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT() _ELM_LAYOUT_ALIASES_IMPLEMENT(MY_CLASS_PFX, content)
#define ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT() _ELM_LAYOUT_ALIASES_IMPLEMENT(MY_CLASS_PFX, text)
#define ELM_LAYOUT_CONTENT_ALIASES_OPS() _ELM_LAYOUT_ALIASES_OPS(MY_CLASS_PFX, content)
#define ELM_LAYOUT_TEXT_ALIASES_OPS() _ELM_LAYOUT_ALIASES_OPS(MY_CLASS_PFX, text)
#endif