diff options
author | WooHyun Jung <wh0705.jung@samsung.com> | 2020-01-16 07:47:23 +0000 |
---|---|---|
committer | Marcel Hollerbach <mail@marcel-hollerbach.de> | 2020-01-16 09:50:10 +0100 |
commit | 0b389a8338eb1a65ce0e2f31bca0c6813785e979 (patch) | |
tree | b6280eddf30a253a0ff047206236a703fbd8fab1 | |
parent | 3ee174a5bf04673491972cc249d8b2c6ae7274cc (diff) | |
download | efl-0b389a8338eb1a65ce0e2f31bca0c6813785e979.tar.gz |
efl_ui_textbox: rename efl_ui_text_part to efl_ui_textbox_part
ref T8522
Reviewed-by: Marcel Hollerbach <mail@marcel-hollerbach.de>
Differential Revision: https://phab.enlightenment.org/D11107
-rw-r--r-- | src/lib/elementary/efl_ui_text_part.eo | 8 | ||||
-rw-r--r-- | src/lib/elementary/efl_ui_textbox.c | 31 | ||||
-rw-r--r-- | src/lib/elementary/efl_ui_textbox_part.eo | 8 | ||||
-rw-r--r-- | src/lib/elementary/meson.build | 2 |
4 files changed, 15 insertions, 34 deletions
diff --git a/src/lib/elementary/efl_ui_text_part.eo b/src/lib/elementary/efl_ui_text_part.eo deleted file mode 100644 index f5d8c0e97e..0000000000 --- a/src/lib/elementary/efl_ui_text_part.eo +++ /dev/null @@ -1,8 +0,0 @@ -class @beta Efl.Ui.Text_Part extends Efl.Ui.Layout_Part_Text -{ - [[Efl UI Text internal part class]] - data: null; - implements { - Efl.Text.text { set; get; } - } -} diff --git a/src/lib/elementary/efl_ui_textbox.c b/src/lib/elementary/efl_ui_textbox.c index 95c2f6f44b..7d34929e89 100644 --- a/src/lib/elementary/efl_ui_textbox.c +++ b/src/lib/elementary/efl_ui_textbox.c @@ -15,7 +15,7 @@ #include "elm_entry_common.h" #include "elm_widget_entry.h" -#include "efl_ui_text_part.eo.h" +#include "efl_ui_textbox_part.eo.h" #include "elm_part_helper.h" #include "efl_canvas_textblock_internal.h" @@ -3560,7 +3560,7 @@ _efl_ui_textbox_text_get(Eo *obj EINA_UNUSED, Efl_Ui_Textbox_Data *pd, #undef STRCMP static Eina_Bool -_part_is_efl_ui_text_part(const Eo *obj EINA_UNUSED, const char *part) +_part_is_efl_ui_textbox_part(const Eo *obj EINA_UNUSED, const char *part) { //Use Efl.Ui.Widget's "background" and "shadow" parts if (eina_streq(part, "background") || eina_streq(part, "shadow")) @@ -3569,30 +3569,11 @@ _part_is_efl_ui_text_part(const Eo *obj EINA_UNUSED, const char *part) return EINA_TRUE; } -EOLIAN static Efl_Object * -_efl_ui_textbox_efl_part_part_get(const Eo *obj, Efl_Ui_Textbox_Data *priv EINA_UNUSED, const char *part) -{ - EINA_SAFETY_ON_NULL_RETURN_VAL(part, NULL); - if (_part_is_efl_ui_text_part(obj, part)) return ELM_PART_IMPLEMENT(EFL_UI_TEXT_PART_CLASS, obj, part); - return efl_part_get(efl_super(obj, EFL_UI_TEXTBOX_CLASS), part); -} - -EOLIAN static void -_efl_ui_text_part_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_get()); - Efl_Ui_Textbox_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_TEXTBOX_CLASS); - _efl_ui_textbox_text_set(pd->obj, sd, pd->part, text); -} +ELM_PART_OVERRIDE_PARTIAL(efl_ui_textbox, EFL_UI_TEXTBOX, Efl_Ui_Textbox_Data, _part_is_efl_ui_textbox_part) +ELM_PART_OVERRIDE_TEXT_SET(efl_ui_textbox, EFL_UI_TEXTBOX, Efl_Ui_Textbox_Data) +ELM_PART_OVERRIDE_TEXT_GET(efl_ui_textbox, EFL_UI_TEXTBOX, Efl_Ui_Textbox_Data) -EOLIAN static const char * -_efl_ui_text_part_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_get()); - Efl_Ui_Textbox_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_TEXTBOX_CLASS); - return _efl_ui_textbox_text_get(pd->obj, sd, pd->part); -} -#include "efl_ui_text_part.eo.c" +#include "efl_ui_textbox_part.eo.c" /* Efl.Part end */ diff --git a/src/lib/elementary/efl_ui_textbox_part.eo b/src/lib/elementary/efl_ui_textbox_part.eo new file mode 100644 index 0000000000..e05e89e525 --- /dev/null +++ b/src/lib/elementary/efl_ui_textbox_part.eo @@ -0,0 +1,8 @@ +class @beta Efl.Ui.Textbox_Part extends Efl.Ui.Layout_Part_Text +{ + [[Efl UI Textbox internal part class]] + data: null; + implements { + Efl.Text.text { set; get; } + } +} diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build index 082551000b..3ca7b935c6 100644 --- a/src/lib/elementary/meson.build +++ b/src/lib/elementary/meson.build @@ -163,7 +163,7 @@ pub_eo_files = [ 'elm_multibuttonentry_part.eo', 'elm_interface_scrollable.eo', 'efl_ui_image_zoomable_pan.eo', - 'efl_ui_text_part.eo', + 'efl_ui_textbox_part.eo', 'efl_ui_caching_factory.eo', 'efl_ui_widget_factory.eo', 'efl_ui_property_bind_part.eo', |