jaehyun pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=e4e7ff3905090a75eb900672be7208f1f62fcf65
commit e4e7ff3905090a75eb900672be7208f1f62fcf65 Author: Taehyub Kim <taehyub....@samsung.com> Date: Thu Nov 7 13:38:47 2019 +0900 efl_ui_alert_popup: add title part in parts block Summary: add title part in parts block Reviewers: Jaehyun_Cho, woohyun, zmike, segfaultxavi Reviewed By: Jaehyun_Cho Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D10596 --- src/lib/elementary/efl_ui_alert_popup.c | 38 ++++++++++++++++++---- src/lib/elementary/efl_ui_alert_popup.eo | 3 ++ ...up_part.eo => efl_ui_alert_popup_part_title.eo} | 2 +- src/lib/elementary/meson.build | 2 +- 4 files changed, 36 insertions(+), 9 deletions(-) diff --git a/src/lib/elementary/efl_ui_alert_popup.c b/src/lib/elementary/efl_ui_alert_popup.c index 0c5fc1bbd9..65dcb4914c 100644 --- a/src/lib/elementary/efl_ui_alert_popup.c +++ b/src/lib/elementary/efl_ui_alert_popup.c @@ -8,7 +8,7 @@ #include "elm_priv.h" #include "efl_ui_alert_popup_private.h" -#include "efl_ui_alert_popup_part.eo.h" +#include "efl_ui_alert_popup_part_title.eo.h" #include "elm_part_helper.h" #define MY_CLASS EFL_UI_ALERT_POPUP_CLASS @@ -257,18 +257,42 @@ _efl_ui_alert_popup_efl_object_destructor(Eo *obj, Efl_Ui_Alert_Popup_Data *pd) } static Eina_Bool -_part_is_efl_ui_alert_popup_part(const Eo *obj, const char *part) +_part_is_efl_ui_alert_popup_part_title(const Eo *obj, const char *part) { if (!_elm_layout_part_aliasing_eval(obj, &part, EINA_TRUE)) return EINA_FALSE; return eina_streq(part, "efl.text.title"); } /* Efl.Part begin */ -ELM_PART_OVERRIDE_PARTIAL(efl_ui_alert_popup, EFL_UI_ALERT_POPUP, - Efl_Ui_Alert_Popup_Data, _part_is_efl_ui_alert_popup_part) -ELM_PART_OVERRIDE_TEXT_SET(efl_ui_alert_popup, EFL_UI_ALERT_POPUP, Efl_Ui_Alert_Popup_Data) -ELM_PART_OVERRIDE_TEXT_GET(efl_ui_alert_popup, EFL_UI_ALERT_POPUP, Efl_Ui_Alert_Popup_Data) -#include "efl_ui_alert_popup_part.eo.c" +EOLIAN static Efl_Object * +_efl_ui_alert_popup_efl_part_part_get(const Eo *obj, Efl_Ui_Alert_Popup_Data *priv EINA_UNUSED, const char *part) +{ + EINA_SAFETY_ON_NULL_RETURN_VAL(part, NULL); + if (_part_is_efl_ui_alert_popup_part_title(obj, part)) + return ELM_PART_IMPLEMENT(EFL_UI_ALERT_POPUP_PART_TITLE_CLASS, obj, part); + return efl_part_get(efl_super(obj, EFL_UI_ALERT_POPUP_CLASS), part); +} + +EOLIAN static void +_efl_ui_alert_popup_part_title_efl_text_text_set(Eo *obj, void *_pd EINA_UNUSED, const char *text) +{ + Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS); + Efl_Ui_Alert_Popup_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_ALERT_POPUP_CLASS); + + _efl_ui_alert_popup_text_set(pd->obj, sd, pd->part, text); +} + +EOLIAN static const char* +_efl_ui_alert_popup_part_title_efl_text_text_get(const Eo *obj, void *_pd EINA_UNUSED) +{ + Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS); + Efl_Ui_Alert_Popup_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_ALERT_POPUP_CLASS); + + return _efl_ui_alert_popup_text_get(pd->obj, sd, pd->part); +} + + +#include "efl_ui_alert_popup_part_title.eo.c" /* Efl.Part end */ EFL_UI_LAYOUT_TEXT_ALIASES_IMPLEMENT(efl_ui_alert_popup) diff --git a/src/lib/elementary/efl_ui_alert_popup.eo b/src/lib/elementary/efl_ui_alert_popup.eo index c154bb2746..b51fcb4658 100644 --- a/src/lib/elementary/efl_ui_alert_popup.eo +++ b/src/lib/elementary/efl_ui_alert_popup.eo @@ -45,6 +45,9 @@ class Efl.Ui.Alert_Popup extends Efl.Ui.Popup } } } + parts { + title @beta: Efl.Ui.Alert_Popup_Part_Title; [[The title text of Alert Popup.]] + } implements { Efl.Object.constructor; Efl.Object.destructor; diff --git a/src/lib/elementary/efl_ui_alert_popup_part.eo b/src/lib/elementary/efl_ui_alert_popup_part_title.eo similarity index 61% rename from src/lib/elementary/efl_ui_alert_popup_part.eo rename to src/lib/elementary/efl_ui_alert_popup_part_title.eo index b5860a99ff..94a489933c 100644 --- a/src/lib/elementary/efl_ui_alert_popup_part.eo +++ b/src/lib/elementary/efl_ui_alert_popup_part_title.eo @@ -1,4 +1,4 @@ -class @beta Efl.Ui.Alert_Popup_Part extends Efl.Ui.Layout_Part_Text +class @beta Efl.Ui.Alert_Popup_Part_Title extends Efl.Ui.Layout_Part_Text { [[Efl UI Alert Popup internal part class]] data: null; diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build index c2cd86bbc9..58c7fd3c09 100644 --- a/src/lib/elementary/meson.build +++ b/src/lib/elementary/meson.build @@ -83,7 +83,7 @@ pub_eo_files = [ 'efl_ui_popup.eo', 'efl_ui_popup_part_backwall.eo', 'efl_ui_alert_popup.eo', - 'efl_ui_alert_popup_part.eo', + 'efl_ui_alert_popup_part_title.eo', 'efl_ui_text_editable.eo', 'efl_ui_text_async.eo', 'efl_ui_text_factory_images.eo', --