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

elm_part_helper: Fix to use registered default text part

This commit is contained in:
Jaehyun Cho 2018-02-07 20:51:04 +09:00
parent fd8e9f9c4e
commit 000d43b29e
5 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -400,6 +400,7 @@ _efl_ui_button_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Efl
/* Standard widget overrides */
ELM_WIDGET_KEY_DOWN_DEFAULT_IMPLEMENT(efl_ui_button, Efl_Ui_Button_Data)
ELM_PART_TEXT_DEFAULT_GET(efl_ui_button, _text_aliases[0].real_part)
ELM_PART_TEXT_DEFAULT_IMPLEMENT(efl_ui_button, Efl_Ui_Button_Data)
ELM_PART_CONTENT_DEFAULT_GET(efl_ui_button, _content_aliases[0].real_part)
ELM_PART_CONTENT_DEFAULT_IMPLEMENT(efl_ui_button, Efl_Ui_Button_Data)

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

@ -203,6 +203,7 @@ _efl_ui_frame_collapse_get(Eo *obj EINA_UNUSED, Efl_Ui_Frame_Data *sd)
/* Default text (title) and content */
ELM_PART_TEXT_DEFAULT_GET(efl_ui_frame, "elm.text")
ELM_PART_TEXT_DEFAULT_IMPLEMENT(efl_ui_frame, Efl_Ui_Frame_Data)
ELM_PART_MARKUP_DEFAULT_IMPLEMENT(efl_ui_frame, Efl_Ui_Frame_Data)
ELM_PART_CONTENT_DEFAULT_GET(efl_ui_frame, "elm.swallow.content")

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

@ -724,6 +724,7 @@ _efl_ui_progressbar_part_efl_ui_range_range_min_max_get(Eo *obj, void *_pd EINA_
/* Efl.Part end */
/* Internal EO APIs and hidden overrides */
ELM_PART_TEXT_DEFAULT_GET(efl_ui_progressbar, _text_aliases[0].real_part)
ELM_PART_TEXT_DEFAULT_IMPLEMENT(efl_ui_progressbar, Efl_Ui_Progressbar_Data)
ELM_PART_MARKUP_DEFAULT_IMPLEMENT(efl_ui_progressbar, Efl_Ui_Progressbar_Data)
ELM_PART_CONTENT_DEFAULT_GET(efl_ui_progressbar, _content_aliases[0].real_part)

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

@ -1395,6 +1395,7 @@ _efl_ui_slider_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Efl
/* Standard widget overrides */
ELM_PART_TEXT_DEFAULT_GET(efl_ui_slider, _text_aliases[0].real_part)
ELM_PART_TEXT_DEFAULT_IMPLEMENT(efl_ui_slider, Efl_Ui_Slider_Data)
ELM_PART_MARKUP_DEFAULT_IMPLEMENT(efl_ui_slider, Efl_Ui_Slider_Data)
ELM_PART_CONTENT_DEFAULT_GET(efl_ui_slider, _content_aliases[0].real_part)

28
src/lib/elementary/elm_part_helper.h
View File

@ -174,38 +174,38 @@ _ ## full ## _efl_text_markup_markup_set(Eo *obj, void *_pd EINA_UNUSED, const c
#define ELM_PART_OVERRIDE_MARKUP_GET(type, TYPE, typedata) \
ELM_PART_OVERRIDE_TEXT_MARKUP_GET_FULL(type ## _part, type, TYPE, typedata)
#define ELM_PART_TEXT_DEFAULT_IMPLEMENT(type, Type) \
#define ELM_PART_TEXT_DEFAULT_IMPLEMENT(type, typedata) \
EOLIAN static void \
_ ## type ## _efl_text_text_set(Eo *obj, Type *pd EINA_UNUSED, const char *text) \
_ ## type ## _efl_text_text_set(Eo *obj, typedata *sd, const char *text) \
{ \
efl_text_set(efl_part(efl_super(obj, MY_CLASS), "elm.text"), text); \
efl_text_set(efl_part(efl_super(obj, MY_CLASS), _ ## type ## _default_text_part_get(obj, sd)), text); \
} \
EOLIAN static const char * \
_ ## type ## _efl_text_text_get(Eo *obj, Type *pd EINA_UNUSED) \
_ ## type ## _efl_text_text_get(Eo *obj, typedata *sd) \
{ \
return efl_text_get(efl_part(efl_super(obj, MY_CLASS), "elm.text")); \
return efl_text_get(efl_part(efl_super(obj, MY_CLASS), _ ## type ## _default_text_part_get(obj, sd))); \
} \
EOLIAN static void \
_ ## type ## _efl_ui_translatable_translatable_text_set(Eo *obj, Type *pd EINA_UNUSED, const char *label, const char *domain) \
_ ## type ## _efl_ui_translatable_translatable_text_set(Eo *obj, typedata *sd, const char *label, const char *domain) \
{ \
efl_ui_translatable_text_set(efl_part(efl_super(obj, MY_CLASS), "elm.text"), label, domain); \
efl_ui_translatable_text_set(efl_part(efl_super(obj, MY_CLASS), _ ## type ## _default_text_part_get(obj, sd)), label, domain); \
} \
EOLIAN static const char * \
_ ## type ## _efl_ui_translatable_translatable_text_get(Eo *obj, Type *pd EINA_UNUSED, const char **domain) \
_ ## type ## _efl_ui_translatable_translatable_text_get(Eo *obj, typedata *sd, const char **domain) \
{ \
return efl_ui_translatable_text_get(efl_part(efl_super(obj, MY_CLASS), "elm.text"), domain); \
return efl_ui_translatable_text_get(efl_part(efl_super(obj, MY_CLASS), _ ## type ## _default_text_part_get(obj, sd)), domain); \
}
#define ELM_PART_MARKUP_DEFAULT_IMPLEMENT(type, Type) \
#define ELM_PART_MARKUP_DEFAULT_IMPLEMENT(type, typedata) \
EOLIAN static const char * \
_ ## type ## _efl_text_markup_markup_get(Eo *obj, Type *pd EINA_UNUSED) \
_ ## type ## _efl_text_markup_markup_get(Eo *obj, typedata *sd) \
{ \
return efl_text_markup_get(efl_part(efl_super(obj, MY_CLASS), "elm.text")); \
return efl_text_markup_get(efl_part(efl_super(obj, MY_CLASS), _ ## type ## _default_text_part_get(obj, sd))); \
} \
EOLIAN static void \
_ ## type ## _efl_text_markup_markup_set(Eo *obj, Type *pd EINA_UNUSED, const char *markup) \
_ ## type ## _efl_text_markup_markup_set(Eo *obj, typedata *sd, const char *markup) \
{ \
efl_text_markup_set(efl_part(efl_super(obj, MY_CLASS), "elm.text"), markup); \
efl_text_markup_set(efl_part(efl_super(obj, MY_CLASS), _ ## type ## _default_text_part_get(obj, sd)), markup); \
} \
#endif