From c12d947484513b6caad91c8e1945e2de3b115cd3 Mon Sep 17 00:00:00 2001 From: Sungtaek Hong Date: Thu, 30 Nov 2017 18:15:11 +0900 Subject: [PATCH] efl_ui_popup: remove unnecessary overides Summary: efl_ui_popup parts overrides efl_content and efl_text which are sometimes not needed. Test Plan: Run elementary_test -> efl_ui_popup tests Reviewers: jpeg, cedric, woohyun, Jaehyun_Cho Reviewed By: Jaehyun_Cho Subscribers: Jaehyun_Cho, Blackmole, herb Differential Revision: https://phab.enlightenment.org/D5556 --- src/lib/elementary/efl_ui_popup.c | 24 ------------ src/lib/elementary/efl_ui_popup_alert.c | 37 ++++++------------- src/lib/elementary/efl_ui_popup_alert_part.eo | 4 +- src/lib/elementary/efl_ui_popup_part.eo | 4 +- 4 files changed, 13 insertions(+), 56 deletions(-) diff --git a/src/lib/elementary/efl_ui_popup.c b/src/lib/elementary/efl_ui_popup.c index 34d6732595..9769605c18 100644 --- a/src/lib/elementary/efl_ui_popup.c +++ b/src/lib/elementary/efl_ui_popup.c @@ -241,35 +241,11 @@ _efl_ui_popup_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Popup_Data *pd EINA_UNUSED) _calc_align(obj); } -static Eina_Bool -_efl_ui_popup_content_set(Eo *obj, Efl_Ui_Popup_Data *pd EINA_UNUSED, const char *part, Eo *content) -{ - return efl_content_set(efl_part(efl_super(obj, MY_CLASS), part), content); -} - -Eo * -_efl_ui_popup_content_get(Eo *obj, Efl_Ui_Popup_Data *pd EINA_UNUSED, const char *part) -{ - return efl_content_get(efl_part(efl_super(obj, MY_CLASS), part)); -} - -static Eo * -_efl_ui_popup_content_unset(Eo *obj, Efl_Ui_Popup_Data *pd EINA_UNUSED, const char *part) -{ - return efl_content_unset(efl_part(efl_super(obj, MY_CLASS), part)); -} - /* Standard widget overrides */ ELM_PART_CONTENT_DEFAULT_GET(efl_ui_popup, "elm.swallow.content") ELM_PART_CONTENT_DEFAULT_IMPLEMENT(efl_ui_popup, Efl_Ui_Popup_Data) -/* Efl.Part begin */ - -ELM_PART_OVERRIDE_CONTENT_SET(efl_ui_popup, EFL_UI_POPUP, Efl_Ui_Popup_Data) -ELM_PART_OVERRIDE_CONTENT_GET(efl_ui_popup, EFL_UI_POPUP, Efl_Ui_Popup_Data) -ELM_PART_OVERRIDE_CONTENT_UNSET(efl_ui_popup, EFL_UI_POPUP, Efl_Ui_Popup_Data) - EOLIAN static Eo * _efl_ui_popup_efl_part_part(const Eo *obj, Efl_Ui_Popup_Data *_pd EINA_UNUSED, const char *part) { diff --git a/src/lib/elementary/efl_ui_popup_alert.c b/src/lib/elementary/efl_ui_popup_alert.c index 9a23d23f49..0249977dea 100644 --- a/src/lib/elementary/efl_ui_popup_alert.c +++ b/src/lib/elementary/efl_ui_popup_alert.c @@ -12,6 +12,13 @@ #define MY_CLASS EFL_UI_POPUP_ALERT_CLASS #define MY_CLASS_NAME "Efl.Ui.Popup.Alert" +static const Elm_Layout_Part_Alias_Description _text_aliases[] = +{ + {"title", "title"}, + {"elm.text.title", "elm.text.title"}, + {NULL, NULL} +}; + static const char PART_NAME_BUTTON[] = "button"; static const char PART_NAME_BUTTON_LAYOUT[EFL_UI_POPUP_ALERT_BUTTON_COUNT][15] = {"button_layout1", @@ -35,7 +42,7 @@ _efl_ui_popup_alert_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Popup_Alert_Data *pd static Eina_Bool _efl_ui_popup_alert_text_set(Eo *obj, Efl_Ui_Popup_Alert_Data *pd, const char *part, const char *label) { - if (part && !strcmp(part, "title")) + if (eina_streq(part, "title") || eina_streq(part, "elm.text.title")) { if (pd->title_text) { @@ -44,7 +51,7 @@ _efl_ui_popup_alert_text_set(Eo *obj, Efl_Ui_Popup_Alert_Data *pd, const char *p } pd->title_text = eina_stringshare_add(label); - elm_object_part_text_set(obj, "elm.text.title", label); + efl_text_set(efl_part(efl_super(obj, MY_CLASS), "elm.text.title"), label); elm_layout_signal_emit(obj, "elm,title,show", "elm"); ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); @@ -60,7 +67,7 @@ _efl_ui_popup_alert_text_set(Eo *obj, Efl_Ui_Popup_Alert_Data *pd, const char *p const char * _efl_ui_popup_alert_text_get(Eo *obj EINA_UNUSED, Efl_Ui_Popup_Alert_Data *pd, const char *part) { - if (part && !strcmp(part, "title")) + if (eina_streq(part, "title") || eina_streq(part, "elm.text.title")) { if (pd->title_text) return pd->title_text; @@ -71,24 +78,6 @@ _efl_ui_popup_alert_text_get(Eo *obj EINA_UNUSED, Efl_Ui_Popup_Alert_Data *pd, c return efl_text_get(efl_part(efl_super(obj, MY_CLASS), part)); } -static Eina_Bool -_efl_ui_popup_alert_content_set(Eo *obj, Efl_Ui_Popup_Alert_Data *pd EINA_UNUSED, const char *part, Eo *content) -{ - return efl_content_set(efl_part(efl_super(obj, MY_CLASS), part), content); -} - -Eo * -_efl_ui_popup_alert_content_get(Eo *obj, Efl_Ui_Popup_Alert_Data *pd EINA_UNUSED, const char *part) -{ - return efl_content_get(efl_part(efl_super(obj, MY_CLASS), part)); -} - -static Eo * -_efl_ui_popup_alert_content_unset(Eo *obj, Efl_Ui_Popup_Alert_Data *pd EINA_UNUSED, const char *part) -{ - return efl_content_unset(efl_part(efl_super(obj, MY_CLASS), part)); -} - static void _positive_button_clicked_cb(void *data, Eo *obj EINA_UNUSED, void *event_info EINA_UNUSED) @@ -274,11 +263,7 @@ _efl_ui_popup_alert_efl_object_destructor(Eo *obj, Efl_Ui_Popup_Alert_Data *pd) } /* Efl.Part begin */ - -ELM_PART_OVERRIDE(efl_ui_popup_alert, EFL_UI_POPUP_ALERT, Efl_Ui_Popup_Alert_Data) -ELM_PART_OVERRIDE_CONTENT_SET(efl_ui_popup_alert, EFL_UI_POPUP_ALERT, Efl_Ui_Popup_Alert_Data) -ELM_PART_OVERRIDE_CONTENT_GET(efl_ui_popup_alert, EFL_UI_POPUP_ALERT, Efl_Ui_Popup_Alert_Data) -ELM_PART_OVERRIDE_CONTENT_UNSET(efl_ui_popup_alert, EFL_UI_POPUP_ALERT, Efl_Ui_Popup_Alert_Data) +ELM_PART_OVERRIDE_ONLY_ALIASES(efl_ui_popup_alert, EFL_UI_POPUP_ALERT, Efl_Ui_Popup_Alert_Data, _text_aliases) ELM_PART_OVERRIDE_TEXT_SET(efl_ui_popup_alert, EFL_UI_POPUP_ALERT, Efl_Ui_Popup_Alert_Data) ELM_PART_OVERRIDE_TEXT_GET(efl_ui_popup_alert, EFL_UI_POPUP_ALERT, Efl_Ui_Popup_Alert_Data) #include "efl_ui_popup_alert_part.eo.c" diff --git a/src/lib/elementary/efl_ui_popup_alert_part.eo b/src/lib/elementary/efl_ui_popup_alert_part.eo index fa9d04fffb..31e607023c 100644 --- a/src/lib/elementary/efl_ui_popup_alert_part.eo +++ b/src/lib/elementary/efl_ui_popup_alert_part.eo @@ -1,10 +1,8 @@ -class Efl.Ui.Popup.Alert.Part (Efl.Ui.Layout.Part_Content, Efl.Ui.Layout.Part_Text) +class Efl.Ui.Popup.Alert.Part (Efl.Ui.Layout.Part_Text) { [[Efl UI Popup Alert internal part class]] data: null; implements { - Efl.Content.content { get; set; } - Efl.Content.content_unset; Efl.Text.text { get; set; } } } diff --git a/src/lib/elementary/efl_ui_popup_part.eo b/src/lib/elementary/efl_ui_popup_part.eo index 5cb6fdf7fb..2e4969826a 100644 --- a/src/lib/elementary/efl_ui_popup_part.eo +++ b/src/lib/elementary/efl_ui_popup_part.eo @@ -1,10 +1,8 @@ -class Efl.Ui.Popup.Part (Efl.Ui.Layout.Part_Content, Efl.Canvas.Object, Efl.File) +class Efl.Ui.Popup.Part (Efl.Ui.Layout.Part, Efl.Canvas.Object, Efl.File) { [[Efl UI Popup internal part class]] data: null; implements { - Efl.Content.content { get; set; } - Efl.Content.content_unset; Efl.Canvas.Object.repeat_events { set; get; } Efl.File.file { set; } }