cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=3114ee264bfe069ba1e45e311b80de31985da476
commit 3114ee264bfe069ba1e45e311b80de31985da476
Author: YeongJong Lee <yj34....@samsung.com>
Date: Fri Apr 6 10:10:05 2018 -0700
efl_part: remove duplicated text_aliases code
Summary: this widgets inherit from Layout. they can use same text_aliases
of Layout.
Reviewers: Jaehyun_Cho, woohyun
Subscribers: herb, cedric
Differential Revision: https://phab.enlightenment.org/D5859
Reviewed-by: Cedric Bail <ced...@osg.samsung.com>
---
src/lib/elementary/efl_ui_button.c | 10 ----------
src/lib/elementary/efl_ui_frame.c | 12 +-----------
src/lib/elementary/efl_ui_progressbar.c | 10 ----------
src/lib/elementary/efl_ui_slider.c | 12 +-----------
4 files changed, 2 insertions(+), 42 deletions(-)
diff --git a/src/lib/elementary/efl_ui_button.c
b/src/lib/elementary/efl_ui_button.c
index e9a5fcb632..db291f1ace 100644
--- a/src/lib/elementary/efl_ui_button.c
+++ b/src/lib/elementary/efl_ui_button.c
@@ -40,12 +40,6 @@ static const Elm_Layout_Part_Alias_Description
_content_aliases[] =
{NULL, NULL}
};
-static const Elm_Layout_Part_Alias_Description _text_aliases[] =
-{
- {"default", "elm.text"},
- {NULL, NULL}
-};
-
static Eina_Bool _key_action_activate(Evas_Object *obj, const char *params);
static const Elm_Action key_actions[] = {
@@ -335,7 +329,6 @@ _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)
@@ -379,14 +372,11 @@ elm_button_autorepeat_get(const Evas_Object *obj)
/* Internal EO APIs and hidden overrides */
ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
-ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
#define EFL_UI_BUTTON_EXTRA_OPS \
ELM_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX), \
- ELM_LAYOUT_TEXT_ALIASES_OPS(MY_CLASS_PFX), \
ELM_LAYOUT_SIZING_EVAL_OPS(efl_ui_button), \
EFL_CANVAS_GROUP_ADD_OPS(efl_ui_button), \
- ELM_PART_TEXT_DEFAULT_OPS(efl_ui_button), \
ELM_PART_CONTENT_DEFAULT_OPS(efl_ui_button)
#include "efl_ui_button.eo.c"
diff --git a/src/lib/elementary/efl_ui_frame.c
b/src/lib/elementary/efl_ui_frame.c
index e4bb944733..ac13297840 100644
--- a/src/lib/elementary/efl_ui_frame.c
+++ b/src/lib/elementary/efl_ui_frame.c
@@ -30,12 +30,6 @@ static const Elm_Layout_Part_Alias_Description
_content_aliases[] =
{NULL, NULL}
};
-static const Elm_Layout_Part_Alias_Description _text_aliases[] =
-{
- {"default", "elm.text"},
- {NULL, NULL}
-};
-
static void
_sizing_eval(Evas_Object *obj,
Efl_Ui_Frame_Data *sd EINA_UNUSED)
@@ -203,7 +197,6 @@ _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")
@@ -212,14 +205,11 @@ ELM_PART_CONTENT_DEFAULT_IMPLEMENT(efl_ui_frame,
Efl_Ui_Frame_Data)
/* Internal EO APIs and hidden overrides */
ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(efl_ui_frame)
-ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(efl_ui_frame)
#define EFL_UI_FRAME_EXTRA_OPS \
EFL_CANVAS_GROUP_ADD_OPS(efl_ui_frame), \
ELM_LAYOUT_CONTENT_ALIASES_OPS(efl_ui_frame), \
- ELM_PART_TEXT_DEFAULT_OPS(efl_ui_frame), \
- ELM_PART_CONTENT_DEFAULT_OPS(efl_ui_frame), \
- ELM_LAYOUT_TEXT_ALIASES_OPS(efl_ui_frame)
+ ELM_PART_CONTENT_DEFAULT_OPS(efl_ui_frame)
#include "efl_ui_frame.eo.c"
diff --git a/src/lib/elementary/efl_ui_progressbar.c
b/src/lib/elementary/efl_ui_progressbar.c
index 64c0f22643..5d40038c31 100644
--- a/src/lib/elementary/efl_ui_progressbar.c
+++ b/src/lib/elementary/efl_ui_progressbar.c
@@ -42,12 +42,6 @@ static const Elm_Layout_Part_Alias_Description
_content_aliases[] =
{NULL, NULL}
};
-static const Elm_Layout_Part_Alias_Description _text_aliases[] =
-{
- {"default", "elm.text"},
- {NULL, NULL}
-};
-
static Efl_Ui_Progress_Status *
_progress_status_new(const char *part_name, double val)
{
@@ -685,21 +679,17 @@
_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)
ELM_PART_CONTENT_DEFAULT_IMPLEMENT(efl_ui_progressbar, Efl_Ui_Progressbar_Data)
ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(efl_ui_progressbar)
-ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(efl_ui_progressbar)
#define EFL_UI_PROGRESSBAR_EXTRA_OPS \
ELM_LAYOUT_CONTENT_ALIASES_OPS(efl_ui_progressbar), \
- ELM_LAYOUT_TEXT_ALIASES_OPS(efl_ui_progressbar), \
ELM_LAYOUT_SIZING_EVAL_OPS(efl_ui_progressbar), \
EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_progressbar), \
- ELM_PART_TEXT_DEFAULT_OPS(efl_ui_progressbar), \
ELM_PART_CONTENT_DEFAULT_OPS(efl_ui_progressbar)
#include "efl_ui_progressbar.eo.c"
diff --git a/src/lib/elementary/efl_ui_slider.c
b/src/lib/elementary/efl_ui_slider.c
index 59a63e4f3a..c02564bbb3 100644
--- a/src/lib/elementary/efl_ui_slider.c
+++ b/src/lib/elementary/efl_ui_slider.c
@@ -28,12 +28,6 @@ static const Elm_Layout_Part_Alias_Description
_content_aliases[] =
{NULL, NULL}
};
-static const Elm_Layout_Part_Alias_Description _text_aliases[] =
-{
- {"default", "elm.text"},
- {NULL, NULL}
-};
-
static const char SIG_CHANGED[] = "changed";
static const char SIG_DELAY_CHANGED[] = "delay,changed";
static const char SIG_DRAG_START[] = "slider,drag,start";
@@ -1395,7 +1389,6 @@
_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)
@@ -1536,15 +1529,12 @@ _efl_ui_slider_part_indicator_visible_mode_get(Eo *obj,
void *_pd EINA_UNUSED)
/* Internal EO APIs and hidden overrides */
ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(efl_ui_slider)
-ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(efl_ui_slider)
#define EFL_UI_SLIDER_EXTRA_OPS \
ELM_LAYOUT_CONTENT_ALIASES_OPS(efl_ui_slider), \
- ELM_LAYOUT_TEXT_ALIASES_OPS(efl_ui_slider), \
ELM_LAYOUT_SIZING_EVAL_OPS(efl_ui_slider), \
EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_slider), \
- ELM_PART_CONTENT_DEFAULT_OPS(efl_ui_slider), \
- ELM_PART_TEXT_DEFAULT_OPS(efl_ui_slider)
+ ELM_PART_CONTENT_DEFAULT_OPS(efl_ui_slider)
#include "efl_ui_slider.eo.c"
--
