summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWooHyun Jung <wh0705.jung@samsung.com>2020-01-16 07:47:23 +0000
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2020-01-16 09:50:10 +0100
commit0b389a8338eb1a65ce0e2f31bca0c6813785e979 (patch)
treeb6280eddf30a253a0ff047206236a703fbd8fab1
parent3ee174a5bf04673491972cc249d8b2c6ae7274cc (diff)
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.eo8
-rw-r--r--src/lib/elementary/efl_ui_textbox.c31
-rw-r--r--src/lib/elementary/efl_ui_textbox_part.eo8
-rw-r--r--src/lib/elementary/meson.build2
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 @@
1class @beta Efl.Ui.Text_Part extends Efl.Ui.Layout_Part_Text
2{
3 [[Efl UI Text internal part class]]
4 data: null;
5 implements {
6 Efl.Text.text { set; get; }
7 }
8}
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 @@
15 15
16#include "elm_entry_common.h" 16#include "elm_entry_common.h"
17#include "elm_widget_entry.h" 17#include "elm_widget_entry.h"
18#include "efl_ui_text_part.eo.h" 18#include "efl_ui_textbox_part.eo.h"
19#include "elm_part_helper.h" 19#include "elm_part_helper.h"
20#include "efl_canvas_textblock_internal.h" 20#include "efl_canvas_textblock_internal.h"
21 21
@@ -3560,7 +3560,7 @@ _efl_ui_textbox_text_get(Eo *obj EINA_UNUSED, Efl_Ui_Textbox_Data *pd,
3560#undef STRCMP 3560#undef STRCMP
3561 3561
3562static Eina_Bool 3562static Eina_Bool
3563_part_is_efl_ui_text_part(const Eo *obj EINA_UNUSED, const char *part) 3563_part_is_efl_ui_textbox_part(const Eo *obj EINA_UNUSED, const char *part)
3564{ 3564{
3565 //Use Efl.Ui.Widget's "background" and "shadow" parts 3565 //Use Efl.Ui.Widget's "background" and "shadow" parts
3566 if (eina_streq(part, "background") || eina_streq(part, "shadow")) 3566 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)
3569 return EINA_TRUE; 3569 return EINA_TRUE;
3570} 3570}
3571 3571
3572EOLIAN static Efl_Object * 3572ELM_PART_OVERRIDE_PARTIAL(efl_ui_textbox, EFL_UI_TEXTBOX, Efl_Ui_Textbox_Data, _part_is_efl_ui_textbox_part)
3573_efl_ui_textbox_efl_part_part_get(const Eo *obj, Efl_Ui_Textbox_Data *priv EINA_UNUSED, const char *part) 3573ELM_PART_OVERRIDE_TEXT_SET(efl_ui_textbox, EFL_UI_TEXTBOX, Efl_Ui_Textbox_Data)
3574{ 3574ELM_PART_OVERRIDE_TEXT_GET(efl_ui_textbox, EFL_UI_TEXTBOX, Efl_Ui_Textbox_Data)
3575 EINA_SAFETY_ON_NULL_RETURN_VAL(part, NULL);
3576 if (_part_is_efl_ui_text_part(obj, part)) return ELM_PART_IMPLEMENT(EFL_UI_TEXT_PART_CLASS, obj, part);
3577 return efl_part_get(efl_super(obj, EFL_UI_TEXTBOX_CLASS), part);
3578}
3579
3580EOLIAN static void
3581_efl_ui_text_part_efl_text_text_set(Eo *obj, void *_pd EINA_UNUSED, const char *text)
3582{
3583 Elm_Part_Data *pd = efl_data_scope_get(obj, efl_ui_widget_part_class_get());
3584 Efl_Ui_Textbox_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_TEXTBOX_CLASS);
3585 _efl_ui_textbox_text_set(pd->obj, sd, pd->part, text);
3586}
3587 3575
3588EOLIAN static const char * 3576#include "efl_ui_textbox_part.eo.c"
3589_efl_ui_text_part_efl_text_text_get(const Eo *obj, void *_pd EINA_UNUSED)
3590{
3591 Elm_Part_Data *pd = efl_data_scope_get(obj, efl_ui_widget_part_class_get());
3592 Efl_Ui_Textbox_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_TEXTBOX_CLASS);
3593 return _efl_ui_textbox_text_get(pd->obj, sd, pd->part);
3594}
3595#include "efl_ui_text_part.eo.c"
3596 3577
3597/* Efl.Part end */ 3578/* Efl.Part end */
3598 3579
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 @@
1class @beta Efl.Ui.Textbox_Part extends Efl.Ui.Layout_Part_Text
2{
3 [[Efl UI Textbox internal part class]]
4 data: null;
5 implements {
6 Efl.Text.text { set; get; }
7 }
8}
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 = [
163 'elm_multibuttonentry_part.eo', 163 'elm_multibuttonentry_part.eo',
164 'elm_interface_scrollable.eo', 164 'elm_interface_scrollable.eo',
165 'efl_ui_image_zoomable_pan.eo', 165 'efl_ui_image_zoomable_pan.eo',
166 'efl_ui_text_part.eo', 166 'efl_ui_textbox_part.eo',
167 'efl_ui_caching_factory.eo', 167 'efl_ui_caching_factory.eo',
168 'efl_ui_widget_factory.eo', 168 'efl_ui_widget_factory.eo',
169 'efl_ui_property_bind_part.eo', 169 'efl_ui_property_bind_part.eo',