summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Hirt <hirt.danny@gmail.com>2017-09-27 16:01:20 +0300
committerDaniel Hirt <hirt.danny@gmail.com>2017-09-27 16:01:20 +0300
commit66f41c6f1cd582d8207a5f9e86231e68d95e3218 (patch)
tree0d84c67e3da9ad1749ebdf6f1cfa4a6ae50ae6bf
parent11cad255fcec1f93e61e6f53c3da1fff0bc9f44c (diff)
downloadefl-devs/herdsman/next2.tar.gz
-rw-r--r--src/lib/edje/edje_part_text.c9
-rw-r--r--src/lib/edje/edje_private.h1
-rw-r--r--src/lib/edje/edje_util.c15
-rw-r--r--src/lib/edje/efl_canvas_layout_part_text.eo3
-rw-r--r--src/lib/elementary/efl_ui_button.eo4
-rw-r--r--src/lib/elementary/efl_ui_frame.eo3
-rw-r--r--src/lib/elementary/efl_ui_layout.c34
-rw-r--r--src/lib/elementary/efl_ui_layout_part_legacy.eo2
-rw-r--r--src/lib/elementary/efl_ui_layout_part_text.eo3
-rw-r--r--src/lib/elementary/efl_ui_slider.eo5
-rw-r--r--src/lib/elementary/elm_entry.c12
-rw-r--r--src/lib/elementary/elm_entry_part.eo2
-rw-r--r--src/lib/elementary/elm_label.c4
-rw-r--r--src/lib/elementary/elm_label_part.eo2
-rw-r--r--src/lib/elementary/elm_part_helper.h35
15 files changed, 111 insertions, 23 deletions
diff --git a/src/lib/edje/edje_part_text.c b/src/lib/edje/edje_part_text.c
index 4db7ce42bd..834b7ed344 100644
--- a/src/lib/edje/edje_part_text.c
+++ b/src/lib/edje/edje_part_text.c
@@ -23,6 +23,15 @@ _efl_canvas_layout_part_text_efl_text_text_get(Eo *obj,
RETURN_VAL(_edje_efl_text_get(obj, pd->ed, pd->part, EINA_FALSE));
}
+EOLIAN static const char *
+_efl_canvas_layout_part_text_efl_text_markup_markup_get(Eo *obj,
+ void *_pd EINA_UNUSED)
+{
+ PROXY_DATA_GET(obj, pd);
+ RETURN_VAL(_edje_efl_text_markup_get(obj, pd->ed, pd->part));
+}
+
+
EOLIAN static Efl_Text_Cursor_Cursor *
_efl_canvas_layout_part_text_efl_text_cursor_cursor_get(Eo *obj,
void *_pd EINA_UNUSED, Efl_Text_Cursor_Cursor_Get_Type get_type)
diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h
index c2dc65f0e7..7665a29f21 100644
--- a/src/lib/edje/edje_private.h
+++ b/src/lib/edje/edje_private.h
@@ -3162,6 +3162,7 @@ Evas_Object *_edje_object_part_external_content_get(Edje *ed, const char *part,
Eo *_edje_text_internal_proxy_get(Edje_Object *obj, Edje *ed, Edje_Real_Part *rp);
Eina_Bool _edje_efl_text_set(Eo *obj, Edje *ed, const char *part, const char *text);
const char *_edje_efl_text_get(Eo *obj, Edje *ed, const char *part, Eina_Bool legacy);
+const char *_edje_efl_text_markup_get(Eo *obj, Edje *ed, const char *part);
Evas_Textblock_Cursor *_edje_text_cursor_get(Edje_Real_Part *rp, Edje_Cursor cur);
void _edje_text_cursor_begin(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor *cur);
void _edje_text_cursor_end(Edje_Real_Part *rp, Efl_Text_Cursor_Cursor *cur);
diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c
index 7de1a9f45e..f660b60ff9 100644
--- a/src/lib/edje/edje_util.c
+++ b/src/lib/edje/edje_util.c
@@ -1946,7 +1946,7 @@ _edje_efl_text_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part,
}
else
{
- entry = efl_text_markup_get(rp->object);
+ entry = efl_text_get(rp->object);
}
return entry;
@@ -1976,7 +1976,7 @@ _edje_efl_text_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part,
}
else
{
- entry = efl_text_markup_get(rp->object);
+ entry = efl_text_get(rp->object);
}
return entry;
@@ -1986,6 +1986,17 @@ _edje_efl_text_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part,
return NULL;
}
+const char *
+_edje_efl_text_markup_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part)
+{
+ Edje_Real_Part *rp;
+
+ if ((!ed) || (!part)) return NULL;
+ rp = _edje_real_part_recursive_get(&ed, part);
+ if (!rp) return NULL;
+ return efl_text_markup_get(rp->object);
+}
+
EAPI const char *
edje_object_part_text_selection_get(const Eo *obj, const char *part)
{
diff --git a/src/lib/edje/efl_canvas_layout_part_text.eo b/src/lib/edje/efl_canvas_layout_part_text.eo
index 67cb7c396f..c49bdc4f38 100644
--- a/src/lib/edje/efl_canvas_layout_part_text.eo
+++ b/src/lib/edje/efl_canvas_layout_part_text.eo
@@ -1,5 +1,5 @@
class Efl.Canvas.Layout.Part_Text (Efl.Canvas.Layout.Part, Efl.Text,
- Efl.Text.Cursor)
+Efl.Text.Markup, Efl.Text.Cursor)
{
[[Represents a TEXT part of a layout
@@ -9,6 +9,7 @@ class Efl.Canvas.Layout.Part_Text (Efl.Canvas.Layout.Part, Efl.Text,
data: null;
implements {
Efl.Text.text { set; get; }
+ Efl.Text.Markup.markup { get; }
Efl.Text.Cursor.cursor { get; }
Efl.Text.Cursor.cursor_paragraph_first;
Efl.Text.Cursor.cursor_paragraph_last;
diff --git a/src/lib/elementary/efl_ui_button.eo b/src/lib/elementary/efl_ui_button.eo
index 021c8229b2..91944bad44 100644
--- a/src/lib/elementary/efl_ui_button.eo
+++ b/src/lib/elementary/efl_ui_button.eo
@@ -1,4 +1,5 @@
-class Efl.Ui.Button (Efl.Ui.Layout, Efl.Ui.Clickable, Efl.Ui.Autorepeat, Efl.Text,
+class Efl.Ui.Button (Efl.Ui.Layout, Efl.Ui.Clickable, Efl.Ui.Autorepeat,
+ Efl.Text, Efl.Text.Markup,
Elm.Interface.Atspi_Widget_Action, Efl.Ui.Translatable)
{
[[Push-button widget
@@ -25,6 +26,7 @@ class Efl.Ui.Button (Efl.Ui.Layout, Efl.Ui.Clickable, Efl.Ui.Autorepeat, Efl.Tex
Elm.Interface.Atspi_Widget_Action.elm_actions { get; }
Efl.Part.part;
Efl.Text.text { get; set; }
+ Efl.Text.Markup.markup { get; set; }
Efl.Ui.Translatable.translatable_text { get; set; }
}
}
diff --git a/src/lib/elementary/efl_ui_frame.eo b/src/lib/elementary/efl_ui_frame.eo
index 21e305c458..9282901be4 100644
--- a/src/lib/elementary/efl_ui_frame.eo
+++ b/src/lib/elementary/efl_ui_frame.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Frame (Efl.Ui.Layout, Efl.Ui.Clickable, Efl.Text,
+class Efl.Ui.Frame (Efl.Ui.Layout, Efl.Ui.Clickable, Efl.Text, Efl.Text.Markup,
Efl.Ui.Translatable)
{
[[Frame widget
@@ -62,6 +62,7 @@ class Efl.Ui.Frame (Efl.Ui.Layout, Efl.Ui.Clickable, Efl.Text,
Elm.Widget.focus_next;
Elm.Widget.focus_direction_manager_is;
Efl.Text.text { get; set; }
+ Efl.Text.Markup.markup { get; set; }
Efl.Ui.Translatable.translatable_text { get; set; }
}
}
diff --git a/src/lib/elementary/efl_ui_layout.c b/src/lib/elementary/efl_ui_layout.c
index 6ba041d75d..f5e5c0cbf7 100644
--- a/src/lib/elementary/efl_ui_layout.c
+++ b/src/lib/elementary/efl_ui_layout.c
@@ -1225,7 +1225,7 @@ _efl_ui_layout_efl_container_content_count(Eo *eo_obj EINA_UNUSED, Efl_Ui_Layout
}
static Eina_Bool
-_efl_ui_layout_text_set(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, const char *text)
+_efl_ui_layout_text_generic_set(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, const char *text, Eina_Bool is_markup)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
@@ -1255,7 +1255,7 @@ _efl_ui_layout_text_set(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, const
if (!text) return EINA_TRUE;
- if (!edje_object_part_text_escaped_set
+ if (is_markup && !edje_object_part_text_escaped_set
(wd->resize_obj, part, text))
return EINA_FALSE;
@@ -1296,12 +1296,32 @@ _efl_ui_layout_text_set(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, const
return EINA_TRUE;
}
+static Eina_Bool
+_efl_ui_layout_text_set(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, const char *text)
+{
+ return _efl_ui_layout_text_generic_set(obj, sd, part, text, EINA_FALSE);
+}
+
static const char*
_efl_ui_layout_text_get(Eo *obj, Efl_Ui_Layout_Data *sd EINA_UNUSED, const char *part)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL);
- return edje_object_part_text_get(wd->resize_obj, part);
+ return efl_text_get(efl_part(wd->resize_obj, part));
+}
+
+static const char*
+_efl_ui_layout_text_markup_get(Eo *obj, Efl_Ui_Layout_Data *sd EINA_UNUSED, const char *part)
+{
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL);
+
+ return efl_text_markup_get(efl_part(wd->resize_obj, part));
+}
+
+static Eina_Bool
+_efl_ui_layout_text_markup_set(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, const char *text)
+{
+ return _efl_ui_layout_text_generic_set(obj, sd, part, text, EINA_TRUE);
}
static void
@@ -2261,7 +2281,7 @@ elm_layout_text_set(Eo *obj, const char *part, const char *text)
else if (!_elm_layout_part_aliasing_eval(obj, &part, EINA_TRUE))
return EINA_FALSE;
- efl_text_set(efl_part(obj, part), text);
+ efl_text_markup_set(efl_part(obj, part), text);
return EINA_TRUE;
}
@@ -2276,7 +2296,7 @@ elm_layout_text_get(const Eo *obj, const char *part)
else if (!_elm_layout_part_aliasing_eval(obj, &part, EINA_TRUE))
return NULL;
- return efl_text_get(efl_part(obj, part));
+ return efl_text_markup_get(efl_part(obj, part));
}
EAPI Eina_Bool
@@ -2564,6 +2584,8 @@ ELM_PART_OVERRIDE_CONTENT_UNSET_FULL(efl_ui_layout_part_content, efl_ui_layout,
/* Efl.Ui.Layout.Part_Text */
ELM_PART_OVERRIDE_TEXT_GET_FULL(efl_ui_layout_part_text, efl_ui_layout, EFL_UI_LAYOUT, Efl_Ui_Layout_Data)
ELM_PART_OVERRIDE_TEXT_SET_FULL(efl_ui_layout_part_text, efl_ui_layout, EFL_UI_LAYOUT, Efl_Ui_Layout_Data)
+ELM_PART_OVERRIDE_TEXT_MARKUP_GET_FULL(efl_ui_layout_part_text, efl_ui_layout, EFL_UI_LAYOUT, Efl_Ui_Layout_Data)
+ELM_PART_OVERRIDE_TEXT_MARKUP_SET_FULL(efl_ui_layout_part_text, efl_ui_layout, EFL_UI_LAYOUT, Efl_Ui_Layout_Data)
EOLIAN static const char *
_efl_ui_layout_part_text_efl_ui_translatable_translatable_text_get(Eo *obj, void *_pd EINA_UNUSED, const char **domain)
@@ -2585,6 +2607,8 @@ ELM_PART_OVERRIDE_CONTENT_SET_FULL(efl_ui_layout_part_legacy, efl_ui_layout, EFL
ELM_PART_OVERRIDE_CONTENT_UNSET_FULL(efl_ui_layout_part_legacy, efl_ui_layout, EFL_UI_LAYOUT, Efl_Ui_Layout_Data)
ELM_PART_OVERRIDE_TEXT_GET_FULL(efl_ui_layout_part_legacy, efl_ui_layout, EFL_UI_LAYOUT, Efl_Ui_Layout_Data)
ELM_PART_OVERRIDE_TEXT_SET_FULL(efl_ui_layout_part_legacy, efl_ui_layout, EFL_UI_LAYOUT, Efl_Ui_Layout_Data)
+ELM_PART_OVERRIDE_TEXT_MARKUP_GET_FULL(efl_ui_layout_part_legacy, efl_ui_layout, EFL_UI_LAYOUT, Efl_Ui_Layout_Data)
+ELM_PART_OVERRIDE_TEXT_MARKUP_SET_FULL(efl_ui_layout_part_legacy, efl_ui_layout, EFL_UI_LAYOUT, Efl_Ui_Layout_Data)
EOLIAN static const char *
_efl_ui_layout_part_legacy_efl_ui_translatable_translatable_text_get(Eo *obj, void *_pd EINA_UNUSED, const char **domain)
diff --git a/src/lib/elementary/efl_ui_layout_part_legacy.eo b/src/lib/elementary/efl_ui_layout_part_legacy.eo
index 3d4d335521..df10b04e6c 100644
--- a/src/lib/elementary/efl_ui_layout_part_legacy.eo
+++ b/src/lib/elementary/efl_ui_layout_part_legacy.eo
@@ -1,4 +1,5 @@
class Efl.Ui.Layout.Part_Legacy (Efl.Ui.Layout.Part, Efl.Container, Efl.Text,
+ Efl.Text.Markup,
Efl.Ui.Translatable)
{
[[Elementary layout internal part class]]
@@ -7,6 +8,7 @@ class Efl.Ui.Layout.Part_Legacy (Efl.Ui.Layout.Part, Efl.Container, Efl.Text,
Efl.Container.content { get; set; }
Efl.Container.content_unset;
Efl.Text.text { set; get; }
+ Efl.Text.Markup.markup { get; set; }
Efl.Ui.Translatable.translatable_text { get; set; }
}
}
diff --git a/src/lib/elementary/efl_ui_layout_part_text.eo b/src/lib/elementary/efl_ui_layout_part_text.eo
index b117a5fbae..9dda607b21 100644
--- a/src/lib/elementary/efl_ui_layout_part_text.eo
+++ b/src/lib/elementary/efl_ui_layout_part_text.eo
@@ -1,10 +1,11 @@
-class Efl.Ui.Layout.Part_Text (Efl.Ui.Layout.Part, Efl.Text,
+class Efl.Ui.Layout.Part_Text (Efl.Ui.Layout.Part, Efl.Text, Efl.Text.Markup,
Efl.Ui.Translatable)
{
[[Elementary layout internal part class]]
data: null;
implements {
Efl.Text.text { set; get; }
+ Efl.Text.Markup.markup { get; set; }
Efl.Ui.Translatable.translatable_text { get; set; }
}
}
diff --git a/src/lib/elementary/efl_ui_slider.eo b/src/lib/elementary/efl_ui_slider.eo
index 0e7d21a153..4c1cd712e4 100644
--- a/src/lib/elementary/efl_ui_slider.eo
+++ b/src/lib/elementary/efl_ui_slider.eo
@@ -2,8 +2,8 @@ type slider_func_type: __undefined_type; [[Elementary slider function type]]
type slider_freefunc_type: __undefined_type; [[Elementary slider free function type]]
class Efl.Ui.Slider (Efl.Ui.Layout, Efl.Ui.Range, Efl.Ui.Direction,
- Efl.Access.Value, Efl.Text, Efl.Ui.Translatable,
- Elm.Interface.Atspi_Widget_Action)
+ Efl.Access.Value, Efl.Text, Efl.Text.Markup,
+ Efl.Ui.Translatable, Elm.Interface.Atspi_Widget_Action)
{
[[Elementary slider class]]
legacy_prefix: elm_slider;
@@ -130,6 +130,7 @@ class Efl.Ui.Slider (Efl.Ui.Layout, Efl.Ui.Range, Efl.Ui.Direction,
Efl.Access.Value.increment { get; }
Elm.Interface.Atspi_Widget_Action.elm_actions { get; }
Efl.Text.text { get; set; }
+ Efl.Text.Markup.markup { get; set; }
Efl.Ui.Translatable.translatable_text { get; set; }
}
events {
diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index ebdb844ee4..34c4e39c71 100644
--- a/src/lib/elementary/elm_entry.c
+++ b/src/lib/elementary/elm_entry.c
@@ -3216,7 +3216,7 @@ _entry_text_append(Evas_Object* obj, const char* entry, Eina_Bool set)
}
static Eina_Bool
-_elm_entry_text_set(Eo *obj, Elm_Entry_Data *sd, const char *part, const char *entry)
+_elm_entry_text_markup_set(Eo *obj, Elm_Entry_Data *sd, const char *part, const char *entry)
{
int len = 0;
@@ -3267,7 +3267,7 @@ _elm_entry_text_set(Eo *obj, Elm_Entry_Data *sd, const char *part, const char *e
}
static const char *
-_elm_entry_text_get(Eo *obj, Elm_Entry_Data *sd, const char *item)
+_elm_entry_text_markup_get(Eo *obj, Elm_Entry_Data *sd, const char *item)
{
const char *text;
@@ -3277,7 +3277,7 @@ _elm_entry_text_get(Eo *obj, Elm_Entry_Data *sd, const char *item)
if (strcmp(item, "elm.text"))
return edje_object_part_text_get(sd->entry_edje, item);
- text = edje_object_part_text_get(sd->entry_edje, "elm.text");
+ text = efl_text_markup_get(efl_part(sd->entry_edje, "elm.text"));
if (!text)
{
ERR("text=NULL for edje %p, part 'elm.text'", sd->entry_edje);
@@ -4159,7 +4159,7 @@ elm_entry_entry_get(const Evas_Object *obj)
{
ELM_ENTRY_CHECK(obj) NULL;
const char *text = NULL;
- text = efl_text_get(efl_part(obj, "elm.text"));
+ text = efl_text_markup_get(efl_part(obj, "elm.text"));
return text;
}
@@ -6052,8 +6052,8 @@ _elm_entry_elm_interface_atspi_accessible_name_get(Eo *obj, Elm_Entry_Data *sd)
ELM_PART_OVERRIDE(elm_entry, ELM_ENTRY, Elm_Entry_Data)
ELM_PART_OVERRIDE_CONTENT_SET(elm_entry, ELM_ENTRY, Elm_Entry_Data)
ELM_PART_OVERRIDE_CONTENT_UNSET(elm_entry, ELM_ENTRY, Elm_Entry_Data)
-ELM_PART_OVERRIDE_TEXT_SET(elm_entry, ELM_ENTRY, Elm_Entry_Data)
-ELM_PART_OVERRIDE_TEXT_GET(elm_entry, ELM_ENTRY, Elm_Entry_Data)
+ELM_PART_OVERRIDE_MARKUP_SET(elm_entry, ELM_ENTRY, Elm_Entry_Data)
+ELM_PART_OVERRIDE_MARKUP_GET(elm_entry, ELM_ENTRY, Elm_Entry_Data)
ELM_PART_CONTENT_DEFAULT_SET(elm_entry, "icon")
#include "elm_entry_part.eo.c"
diff --git a/src/lib/elementary/elm_entry_part.eo b/src/lib/elementary/elm_entry_part.eo
index 8ad6754241..25dcd20904 100644
--- a/src/lib/elementary/elm_entry_part.eo
+++ b/src/lib/elementary/elm_entry_part.eo
@@ -5,6 +5,6 @@ class Elm.Entry.Part (Efl.Ui.Layout.Part_Legacy)
implements {
Efl.Container.content { set; }
Efl.Container.content_unset;
- Efl.Text.text { set; get; }
+ Efl.Text.Markup.markup { get; set; }
}
}
diff --git a/src/lib/elementary/elm_label.c b/src/lib/elementary/elm_label.c
index 891e1d2fd8..7a0ff4a534 100644
--- a/src/lib/elementary/elm_label.c
+++ b/src/lib/elementary/elm_label.c
@@ -334,7 +334,7 @@ _stringshare_key_value_replace(const char **srcstring, const char *key, const ch
}
static Eina_Bool
-_elm_label_text_set(Eo *obj, Elm_Label_Data *sd, const char *part, const char *label)
+_elm_label_text_markup_set(Eo *obj, Elm_Label_Data *sd, const char *part, const char *label)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
Eina_Bool int_ret = EINA_TRUE;
@@ -635,7 +635,7 @@ _elm_label_class_constructor(Efl_Class *klass)
/* Efl.Part begin */
ELM_PART_OVERRIDE(elm_label, ELM_LABEL, Elm_Label_Data)
-ELM_PART_OVERRIDE_TEXT_SET(elm_label, ELM_LABEL, Elm_Label_Data)
+ELM_PART_OVERRIDE_MARKUP_SET(elm_label, ELM_LABEL, Elm_Label_Data)
#include "elm_label_part.eo.c"
/* Efl.Part end */
diff --git a/src/lib/elementary/elm_label_part.eo b/src/lib/elementary/elm_label_part.eo
index e62729a056..e57346e753 100644
--- a/src/lib/elementary/elm_label_part.eo
+++ b/src/lib/elementary/elm_label_part.eo
@@ -3,6 +3,6 @@ class Elm_Label.Part (Efl.Ui.Layout.Part_Legacy)
[[Elementary button internal part class]]
data: null;
implements {
- Efl.Text.text { set; }
+ Efl.Text.Markup.markup { set; }
}
}
diff --git a/src/lib/elementary/elm_part_helper.h b/src/lib/elementary/elm_part_helper.h
index bf84b5710a..99759b935b 100644
--- a/src/lib/elementary/elm_part_helper.h
+++ b/src/lib/elementary/elm_part_helper.h
@@ -125,6 +125,25 @@ _ ## full ## _efl_text_text_get(Eo *obj, void *_pd EINA_UNUSED) \
ELM_PART_RETURN_VAL(_ ## type ## _text_get(pd->obj, sd, pd->part)); \
}
+#define ELM_PART_OVERRIDE_TEXT_MARKUP_GET_FULL(full, type, TYPE, typedata) \
+EOLIAN static const char *\
+_ ## full ## _efl_text_markup_markup_get(Eo *obj, void *_pd EINA_UNUSED) \
+{ \
+ Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS); \
+ typedata *sd = efl_data_scope_get(pd->obj, TYPE ## _CLASS); \
+ ELM_PART_RETURN_VAL(_ ## type ## _text_markup_get(pd->obj, sd, pd->part)); \
+}
+
+#define ELM_PART_OVERRIDE_TEXT_MARKUP_SET_FULL(full, type, TYPE, typedata) \
+EOLIAN static void \
+_ ## full ## _efl_text_markup_markup_set(Eo *obj, void *_pd EINA_UNUSED, const char *markup) \
+{ \
+ Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS); \
+ typedata *sd = efl_data_scope_get(pd->obj, TYPE ## _CLASS); \
+ _ ## type ## _text_markup_set(pd->obj, sd, pd->part, markup); \
+ ELM_PART_RETURN_VOID; \
+}
+
#define ELM_PART_OVERRIDE_CONTENT_SET(type, TYPE, typedata) \
ELM_PART_OVERRIDE_CONTENT_SET_FULL(type ## _part, type, TYPE, typedata)
@@ -140,6 +159,12 @@ _ ## full ## _efl_text_text_get(Eo *obj, void *_pd EINA_UNUSED) \
#define ELM_PART_OVERRIDE_TEXT_GET(type, TYPE, typedata) \
ELM_PART_OVERRIDE_TEXT_GET_FULL(type ## _part, type, TYPE, typedata)
+#define ELM_PART_OVERRIDE_MARKUP_SET(type, TYPE, typedata) \
+ ELM_PART_OVERRIDE_TEXT_MARKUP_SET_FULL(type ## _part, type, TYPE, typedata)
+
+#define ELM_PART_OVERRIDE_MARKUP_GET(type, TYPE, typedata) \
+ ELM_PART_OVERRIDE_TEXT_MARKUP_GET_FULL(type ## _part, type, TYPE, typedata)
+
#define ELM_PART_TEXT_DEFAULT_IMPLEMENT(type, Type) \
EOLIAN static void \
_ ## type ## _efl_text_text_set(Eo *obj, Type *pd EINA_UNUSED, const char *text) \
@@ -151,6 +176,16 @@ _ ## type ## _efl_text_text_get(Eo *obj, Type *pd EINA_UNUSED) \
{ \
return efl_text_get(efl_part(efl_super(obj, MY_CLASS), "elm.text")); \
} \
+EOLIAN static const char * \
+_ ## type ## _efl_text_markup_markup_get(Eo *obj, Type *pd EINA_UNUSED) \
+{ \
+ return efl_text_markup_get(efl_part(efl_super(obj, MY_CLASS), "elm.text")); \
+} \
+EOLIAN static void \
+_ ## type ## _efl_text_markup_markup_set(Eo *obj, Type *pd EINA_UNUSED, const char *markup) \
+{ \
+ return efl_text_markup_set(efl_part(efl_super(obj, MY_CLASS), "elm.text"), markup); \
+} \
EOLIAN static void \
_ ## type ## _efl_ui_translatable_translatable_text_set(Eo *obj, Type *pd EINA_UNUSED, const char *label, const char *domain) \
{ \