diff options
author | Ali Alzyod <ali198724@gmail.com> | 2019-11-28 16:55:26 +0900 |
---|---|---|
committer | WooHyun Jung <wh0705.jung@samsung.com> | 2019-11-28 16:55:27 +0900 |
commit | 7bdb63d045cf3377abb7966d018da10c4e8d6b13 (patch) | |
tree | 18d5ddd1391f755bca294fee486d1740b55dba38 /src/lib/evas | |
parent | fa1aa10d792129a031ec16b20d73aa99804359de (diff) | |
download | efl-7bdb63d045cf3377abb7966d018da10c4e8d6b13.tar.gz |
Polish text interface methods
Summary:
This patch is set to rename some properties of `Efl.Text_Font` & `Efl.Text_Format` interfaces.
1- efl_text_font_set/get become (efl_text_font_family_set/get, efl_text_font_size_set/get)
2- efl_text_valign/halign become efl_text_vertical/horizontal_align
3- efl_text_halign_auto_type become efl_text_horizontal_align_auto_type
Reviewers: ali.alzyod, woohyun, segfaultxavi, bu5hm4n, zmike, cedric
Reviewed By: woohyun
Subscribers: zmike, #committers, #reviewers, cedric
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D10716
Diffstat (limited to 'src/lib/evas')
-rw-r--r-- | src/lib/evas/canvas/efl_canvas_text.eo | 9 | ||||
-rw-r--r-- | src/lib/evas/canvas/evas_object_text.c | 86 | ||||
-rw-r--r-- | src/lib/evas/canvas/evas_object_textblock.c | 45 | ||||
-rw-r--r-- | src/lib/evas/canvas/evas_object_textgrid.c | 42 | ||||
-rw-r--r-- | src/lib/evas/canvas/evas_text_eo.c | 6 | ||||
-rw-r--r-- | src/lib/evas/canvas/evas_textgrid_eo.c | 16 | ||||
-rw-r--r-- | src/lib/evas/canvas/evas_textgrid_eo.h | 2 | ||||
-rw-r--r-- | src/lib/evas/canvas/evas_textgrid_eo.legacy.h | 2 |
8 files changed, 135 insertions, 73 deletions
diff --git a/src/lib/evas/canvas/efl_canvas_text.eo b/src/lib/evas/canvas/efl_canvas_text.eo index f5e6af118f..6cdfaff8be 100644 --- a/src/lib/evas/canvas/efl_canvas_text.eo +++ b/src/lib/evas/canvas/efl_canvas_text.eo @@ -191,7 +191,8 @@ class @beta Efl.Canvas.Text extends Efl.Canvas.Object implements Efl.Text, Efl.Canvas.Filter.Internal.filter_dirty; Efl.Canvas.Filter.Internal.filter_input_render; Efl.Canvas.Filter.Internal.filter_state_prepare; - Efl.Text_Font.font { get; set; } + Efl.Text_Font.font_family { get; set; } + Efl.Text_Font.font_size { get; set; } Efl.Text_Font.font_source { get; set; } Efl.Text_Font.font_fallbacks { get; set; } Efl.Text_Font.font_lang { get; set; } @@ -221,9 +222,9 @@ class @beta Efl.Canvas.Text extends Efl.Canvas.Object implements Efl.Text, Efl.Text_Format.ellipsis { get; set; } Efl.Text_Format.wrap { get; set; } Efl.Text_Format.multiline { get; set; } - Efl.Text_Format.halign { get; set; } - Efl.Text_Format.halign_auto_type { get; set; } - Efl.Text_Format.valign { get; set; } + Efl.Text_Format.horizontal_align { get; set; } + Efl.Text_Format.horizontal_align_auto_type { get; set; } + Efl.Text_Format.vertical_align { get; set; } Efl.Text_Format.linegap { get; set; } Efl.Text_Format.linerelgap { get; set; } Efl.Text_Format.tabstops { get; set; } diff --git a/src/lib/evas/canvas/evas_object_text.c b/src/lib/evas/canvas/evas_object_text.c index e8eafcaee3..228aafb993 100644 --- a/src/lib/evas/canvas/evas_object_text.c +++ b/src/lib/evas/canvas/evas_object_text.c @@ -450,52 +450,64 @@ _evas_text_font_reload(Eo *eo_obj, Evas_Text_Data *o) } EOLIAN static void -_evas_text_efl_text_font_font_set(Eo *eo_obj, Evas_Text_Data *o, const char *font, Evas_Font_Size size) +_evas_text_efl_text_font_font_family_set(Eo *eo_obj, Evas_Text_Data *o, const char *font) { Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); Evas_Font_Description *fdesc; - if (!font && size <= 0) return; + EINA_SAFETY_ON_NULL_RETURN(font); evas_object_async_block(obj); - if ((size == o->cur.size) && - (o->cur.font && font && !strcmp(font, o->cur.font))) return; + if (eina_streq(font, o->cur.font)) return; - if (font) - { - /* We can't assume the given font is same with current fdesc by comparing string. - Since Evas starts to supporting "auto" for language, - the given font string should be parsed once before comparing it. */ - fdesc = evas_font_desc_new(); - - /* Set default language according to locale. */ - eina_stringshare_replace(&(fdesc->lang), evas_font_lang_normalize("auto")); - evas_font_name_parse(fdesc, font); + /* We can't assume the given font is same with current fdesc by comparing string. + Since Evas starts to supporting "auto" for language, + the given font string should be parsed once before comparing it. */ + fdesc = evas_font_desc_new(); - if (o->cur.fdesc && !evas_font_desc_cmp(fdesc, o->cur.fdesc) && - (size == o->cur.size)) - { - evas_font_desc_unref(fdesc); - return; - } + /* Set default language according to locale. */ + eina_stringshare_replace(&(fdesc->lang), evas_font_lang_normalize("auto")); + evas_font_name_parse(fdesc, font); - if (o->cur.fdesc) evas_font_desc_unref(o->cur.fdesc); - o->cur.fdesc = fdesc; - eina_stringshare_replace(&o->cur.font, font); - o->prev.font = NULL; + if (o->cur.fdesc && !evas_font_desc_cmp(fdesc, o->cur.fdesc)) + { + evas_font_desc_unref(fdesc); + return; } - if ( size > 0 ) - o->cur.size = size; + if (o->cur.fdesc) evas_font_desc_unref(o->cur.fdesc); + o->cur.fdesc = fdesc; + eina_stringshare_replace(&o->cur.font, font); + o->prev.font = NULL; _evas_text_font_reload(eo_obj, o); } +EOLIAN static const char * +_evas_text_efl_text_font_font_family_get(const Eo *eo_obj EINA_UNUSED, Evas_Text_Data *o) +{ + return o->cur.font; +} + EOLIAN static void -_evas_text_efl_text_font_font_get(const Eo *eo_obj EINA_UNUSED, Evas_Text_Data *o, const char **font, Evas_Font_Size *size) +_evas_text_efl_text_font_font_size_set(Eo *eo_obj, Evas_Text_Data *o, Evas_Font_Size size) { - if (font) *font = o->cur.font; - if (size) *size = o->cur.size; + Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); + + EINA_SAFETY_ON_TRUE_RETURN(size <= 0); + if (size == o->cur.size) return; + + evas_object_async_block(obj); + + o->cur.size = size; + + _evas_text_font_reload(eo_obj, o); +} + +EOLIAN static Evas_Font_Size +_evas_text_efl_text_font_font_size_get(const Eo *eo_obj EINA_UNUSED, Evas_Text_Data *o) +{ + return o->cur.size; } static void @@ -1043,7 +1055,8 @@ _evas_text_efl_object_dbg_info_get(Eo *eo_obj, Evas_Text_Data *o EINA_UNUSED, Ef const char *text; int size; - efl_text_font_get(eo_obj, &text, &size); + text = efl_text_font_family_get(eo_obj); + size = efl_text_font_size_get(eo_obj); EFL_DBG_INFO_APPEND(group, "Font", EINA_VALUE_TYPE_STRING, text); EFL_DBG_INFO_APPEND(group, "Text size", EINA_VALUE_TYPE_INT, size); @@ -2200,6 +2213,8 @@ _evas_text_efl_gfx_entity_scale_set(Evas_Object *eo_obj, Evas_Text_Data *o, font = eina_stringshare_add(o->cur.font); size = o->cur.size; if (o->cur.font) eina_stringshare_del(o->cur.font); + if (o->cur.fdesc) evas_font_desc_unref(o->cur.fdesc); + o->cur.fdesc = NULL; o->cur.font = NULL; o->prev.font = NULL; o->cur.size = 0; @@ -2336,14 +2351,19 @@ evas_object_text_font_source_get(const Eo *obj) EAPI void evas_object_text_font_set(Eo *obj, const char *font, Evas_Font_Size size) { - if (!font || size <= 0) return; /*Condition for legacy object*/ - efl_text_font_set((Eo *) obj, font, size); + /*Condition for legacy object*/ + EINA_SAFETY_ON_NULL_RETURN(font); + EINA_SAFETY_ON_TRUE_RETURN(size <= 0); + + efl_text_font_family_set((Eo *) obj, font); + efl_text_font_size_set((Eo *) obj, size); } EAPI void evas_object_text_font_get(const Eo *obj, const char **font, Evas_Font_Size *size) { - efl_text_font_get((Eo *) obj, font, size); + if (font) *font = efl_text_font_family_get((Eo *) obj); + if (size) *size = efl_text_font_size_get((Eo *) obj); } EAPI void diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c index 8b63713d6a..75c4be5529 100644 --- a/src/lib/evas/canvas/evas_object_textblock.c +++ b/src/lib/evas/canvas/evas_object_textblock.c @@ -15971,20 +15971,16 @@ _canvas_text_format_changed(Eo *eo_obj, Efl_Canvas_Text_Data *o) /* Efl.Text.Font interface implementation */ static void -_efl_canvas_text_efl_text_font_font_set(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, const char *font EINA_UNUSED, int size EINA_UNUSED) +_efl_canvas_text_efl_text_font_font_family_set(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, const char *font) { ASYNC_BLOCK; Eina_Bool changed = EINA_FALSE; Eina_Stringshare *nfont; - if (size > 0 && o->default_format.info.size != size) - { - o->default_format.info.size = size; - changed = EINA_TRUE; - } + EINA_SAFETY_ON_NULL_RETURN(font); - if (font && o->default_format.info.font != font) + if (_FMT_INFO(font) != font && !eina_streq(_FMT_INFO(font), font)) { nfont = eina_stringshare_add(font); if (nfont == _FMT_INFO(font)) @@ -16006,11 +16002,28 @@ _efl_canvas_text_efl_text_font_font_set(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Dat } } +static const char * +_efl_canvas_text_efl_text_font_font_family_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o) +{ + return o->default_format.info.font; +} + static void -_efl_canvas_text_efl_text_font_font_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, const char **font EINA_UNUSED, int *size EINA_UNUSED) +_efl_canvas_text_efl_text_font_font_size_set(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o, int size) +{ + ASYNC_BLOCK; + EINA_SAFETY_ON_FALSE_RETURN(size > 0); + if (o->default_format.info.size != size) + { + o->default_format.info.size = size; + _canvas_text_format_changed(obj, o); + } +} + +static Efl_Font_Size +_efl_canvas_text_efl_text_font_font_size_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o) { - if (font) *font = o->default_format.info.font; - if (size) *size = o->default_format.info.size; + return o->default_format.info.size; } static void @@ -16583,7 +16596,7 @@ _efl_canvas_text_efl_text_format_multiline_get(const Eo *obj EINA_UNUSED, Efl_Ca } static void -_efl_canvas_text_efl_text_format_halign_auto_type_set(Eo *obj, Efl_Canvas_Text_Data *o, Efl_Text_Format_Horizontal_Alignment_Auto_Type type) +_efl_canvas_text_efl_text_format_horizontal_align_auto_type_set(Eo *obj, Efl_Canvas_Text_Data *o, Efl_Text_Format_Horizontal_Alignment_Auto_Type type) { ASYNC_BLOCK; if (type == EFL_TEXT_FORMAT_HORIZONTAL_ALIGNMENT_AUTO_TYPE_NONE) @@ -16605,7 +16618,7 @@ _efl_canvas_text_efl_text_format_halign_auto_type_set(Eo *obj, Efl_Canvas_Text_D } static Efl_Text_Format_Horizontal_Alignment_Auto_Type -_efl_canvas_text_efl_text_format_halign_auto_type_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o) +_efl_canvas_text_efl_text_format_horizontal_align_auto_type_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o) { Efl_Text_Format_Horizontal_Alignment_Auto_Type ret = EFL_TEXT_FORMAT_HORIZONTAL_ALIGNMENT_AUTO_TYPE_NONE; @@ -16626,7 +16639,7 @@ _efl_canvas_text_efl_text_format_halign_auto_type_get(const Eo *obj EINA_UNUSED, } static void -_efl_canvas_text_efl_text_format_halign_set(Eo *obj, Efl_Canvas_Text_Data *o, +_efl_canvas_text_efl_text_format_horizontal_align_set(Eo *obj, Efl_Canvas_Text_Data *o, double value) { ASYNC_BLOCK; @@ -16636,13 +16649,13 @@ _efl_canvas_text_efl_text_format_halign_set(Eo *obj, Efl_Canvas_Text_Data *o, } static double -_efl_canvas_text_efl_text_format_halign_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED) +_efl_canvas_text_efl_text_format_horizontal_align_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED) { return _FMT(halign); } static void -_efl_canvas_text_efl_text_format_valign_set(Eo *obj, Efl_Canvas_Text_Data *o, +_efl_canvas_text_efl_text_format_vertical_align_set(Eo *obj, Efl_Canvas_Text_Data *o, double value) { ASYNC_BLOCK; @@ -16654,7 +16667,7 @@ _efl_canvas_text_efl_text_format_valign_set(Eo *obj, Efl_Canvas_Text_Data *o, } static double -_efl_canvas_text_efl_text_format_valign_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED) +_efl_canvas_text_efl_text_format_vertical_align_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED) { return o->valign; } diff --git a/src/lib/evas/canvas/evas_object_textgrid.c b/src/lib/evas/canvas/evas_object_textgrid.c index 2b3b97c370..e73609668a 100644 --- a/src/lib/evas/canvas/evas_object_textgrid.c +++ b/src/lib/evas/canvas/evas_object_textgrid.c @@ -1192,16 +1192,14 @@ _evas_textgrid_font_reload(Eo *eo_obj, Evas_Textgrid_Data *o) } EOLIAN static void -_evas_textgrid_efl_text_font_font_set(Eo *eo_obj, +_evas_textgrid_efl_text_font_font_family_set(Eo *eo_obj, Evas_Textgrid_Data *o, - const char *font_name, - Evas_Font_Size font_size) + const char *font_name) { Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); Evas_Font_Description *fdesc; - if ((!font_name) || (!*font_name) || (font_size <= 0)) - return; + EINA_SAFETY_ON_TRUE_RETURN((!font_name) || (!*font_name)); evas_object_async_block(obj); fdesc = evas_font_desc_new(); @@ -1210,8 +1208,7 @@ _evas_textgrid_efl_text_font_font_set(Eo *eo_obj, evas_font_lang_normalize("auto")); evas_font_name_parse(fdesc, font_name); if (o->cur.font_description_normal && - !evas_font_desc_cmp(fdesc, o->cur.font_description_normal) && - (font_size == o->cur.font_size)) + !evas_font_desc_cmp(fdesc, o->cur.font_description_normal)) { evas_font_desc_unref(fdesc); return; @@ -1221,7 +1218,6 @@ _evas_textgrid_efl_text_font_font_set(Eo *eo_obj, evas_font_desc_unref(o->cur.font_description_normal); o->cur.font_description_normal = fdesc; - o->cur.font_size = font_size; eina_stringshare_replace(&o->cur.font_name, font_name); o->prev.font_name = NULL; @@ -1229,9 +1225,28 @@ _evas_textgrid_efl_text_font_font_set(Eo *eo_obj, } EOLIAN static void -_evas_textgrid_efl_text_font_font_get(const Eo *eo_obj EINA_UNUSED, Evas_Textgrid_Data *o, const char **font_name, Evas_Font_Size *font_size) +_evas_textgrid_efl_text_font_font_family_get(const Eo *eo_obj EINA_UNUSED, Evas_Textgrid_Data *o, const char **font_name) { if (font_name) *font_name = o->cur.font_name; +} + +EOLIAN static void +_evas_textgrid_efl_text_font_font_size_set(Eo *eo_obj, + Evas_Textgrid_Data *o, + Evas_Font_Size font_size) +{ + EINA_SAFETY_ON_TRUE_RETURN(font_size <= 0); + + if (font_size == o->cur.font_size) return; + + o->cur.font_size = font_size; + + _evas_textgrid_font_reload(eo_obj, o); +} + +EOLIAN static void +_evas_textgrid_efl_text_font_font_size_get(const Eo *eo_obj EINA_UNUSED, Evas_Textgrid_Data *o, Evas_Font_Size *font_size) +{ if (font_size) *font_size = o->cur.font_size; } @@ -1442,7 +1457,8 @@ _evas_textgrid_efl_object_dbg_info_get(Eo *eo_obj, Evas_Textgrid_Data *o EINA_UN const char *text; int size; - efl_text_font_get(eo_obj, &text, &size); + text = efl_text_font_family_get(eo_obj); + size = efl_text_font_size_get(eo_obj); EFL_DBG_INFO_APPEND(group, "Font", EINA_VALUE_TYPE_STRING, text); EFL_DBG_INFO_APPEND(group, "Text size", EINA_VALUE_TYPE_INT, size); @@ -1475,13 +1491,15 @@ evas_object_textgrid_font_source_get(const Eo *obj) EAPI void evas_object_textgrid_font_set(Eo *obj, const char *font_name, Evas_Font_Size font_size) { - efl_text_font_set((Eo *) obj, font_name, font_size); + efl_text_font_family_set((Eo *) obj, font_name); + efl_text_font_size_set((Eo *) obj, font_size); } EAPI void evas_object_textgrid_font_get(const Eo *obj, const char **font_name, Evas_Font_Size *font_size) { - efl_text_font_get((Eo *) obj, font_name, font_size); + if (font_name) *font_name = efl_text_font_family_get((Eo *) obj); + if (font_size) *font_size = efl_text_font_size_get((Eo *) obj); } EOLIAN static void diff --git a/src/lib/evas/canvas/evas_text_eo.c b/src/lib/evas/canvas/evas_text_eo.c index 9285d46114..0dde4eb3c7 100644 --- a/src/lib/evas/canvas/evas_text_eo.c +++ b/src/lib/evas/canvas/evas_text_eo.c @@ -252,8 +252,10 @@ _evas_text_class_initializer(Efl_Class *klass) EFL_OBJECT_OP_FUNC(efl_gfx_entity_scale_set, _evas_text_efl_gfx_entity_scale_set), EFL_OBJECT_OP_FUNC(efl_text_set, _evas_text_efl_text_text_set), EFL_OBJECT_OP_FUNC(efl_text_get, _evas_text_efl_text_text_get), - EFL_OBJECT_OP_FUNC(efl_text_font_set, _evas_text_efl_text_font_font_set), - EFL_OBJECT_OP_FUNC(efl_text_font_get, _evas_text_efl_text_font_font_get), + EFL_OBJECT_OP_FUNC(efl_text_font_family_set, _evas_text_efl_text_font_font_family_set), + EFL_OBJECT_OP_FUNC(efl_text_font_family_get, _evas_text_efl_text_font_font_family_get), + EFL_OBJECT_OP_FUNC(efl_text_font_size_set, _evas_text_efl_text_font_font_size_set), + EFL_OBJECT_OP_FUNC(efl_text_font_size_get, _evas_text_efl_text_font_font_size_get), EFL_OBJECT_OP_FUNC(efl_text_font_source_set, _evas_text_efl_text_font_font_source_set), EFL_OBJECT_OP_FUNC(efl_text_font_source_get, _evas_text_efl_text_font_font_source_get), EFL_OBJECT_OP_FUNC(efl_text_font_bitmap_scalable_set, _evas_text_efl_text_font_font_bitmap_scalable_set), diff --git a/src/lib/evas/canvas/evas_textgrid_eo.c b/src/lib/evas/canvas/evas_textgrid_eo.c index ae3d07e7cc..ce49c063b9 100644 --- a/src/lib/evas/canvas/evas_textgrid_eo.c +++ b/src/lib/evas/canvas/evas_textgrid_eo.c @@ -45,10 +45,16 @@ Efl_Object *_evas_textgrid_efl_object_constructor(Eo *obj, Evas_Textgrid_Data *p void _evas_textgrid_efl_object_destructor(Eo *obj, Evas_Textgrid_Data *pd); -void _evas_textgrid_efl_text_font_font_set(Eo *obj, Evas_Textgrid_Data *pd, const char *font, Efl_Font_Size size); +void _evas_textgrid_efl_text_font_font_family_set(Eo *obj, Evas_Textgrid_Data *pd, const char *font); -void _evas_textgrid_efl_text_font_font_get(const Eo *obj, Evas_Textgrid_Data *pd, const char **font, Efl_Font_Size *size); +void _evas_textgrid_efl_text_font_font_family_get(const Eo *obj, Evas_Textgrid_Data *pd, const char **font); + + +void _evas_textgrid_efl_text_font_font_size_set(Eo *obj, Evas_Textgrid_Data *pd, Efl_Font_Size size); + + +void _evas_textgrid_efl_text_font_font_size_get(const Eo *obj, Evas_Textgrid_Data *pd, Efl_Font_Size *size); void _evas_textgrid_efl_text_font_font_source_set(Eo *obj, Evas_Textgrid_Data *pd, const char *font_source); @@ -90,8 +96,10 @@ _evas_textgrid_class_initializer(Efl_Class *klass) EFL_OBJECT_OP_FUNC(evas_obj_textgrid_palette_get, _evas_textgrid_palette_get), EFL_OBJECT_OP_FUNC(efl_constructor, _evas_textgrid_efl_object_constructor), EFL_OBJECT_OP_FUNC(efl_destructor, _evas_textgrid_efl_object_destructor), - EFL_OBJECT_OP_FUNC(efl_text_font_set, _evas_textgrid_efl_text_font_font_set), - EFL_OBJECT_OP_FUNC(efl_text_font_get, _evas_textgrid_efl_text_font_font_get), + EFL_OBJECT_OP_FUNC(efl_text_font_family_set, _evas_textgrid_efl_text_font_font_family_set), + EFL_OBJECT_OP_FUNC(efl_text_font_family_get, _evas_textgrid_efl_text_font_font_family_get), + EFL_OBJECT_OP_FUNC(efl_text_font_size_set, _evas_textgrid_efl_text_font_font_size_set), + EFL_OBJECT_OP_FUNC(efl_text_font_size_get, _evas_textgrid_efl_text_font_font_size_get), EFL_OBJECT_OP_FUNC(efl_text_font_source_set, _evas_textgrid_efl_text_font_font_source_set), EFL_OBJECT_OP_FUNC(efl_text_font_source_get, _evas_textgrid_efl_text_font_font_source_get), EFL_OBJECT_OP_FUNC(efl_text_font_bitmap_scalable_set, _evas_textgrid_efl_text_font_font_bitmap_scalable_set), diff --git a/src/lib/evas/canvas/evas_textgrid_eo.h b/src/lib/evas/canvas/evas_textgrid_eo.h index 3eac6dc682..0b88b67db8 100644 --- a/src/lib/evas/canvas/evas_textgrid_eo.h +++ b/src/lib/evas/canvas/evas_textgrid_eo.h @@ -119,7 +119,7 @@ EOAPI void evas_obj_textgrid_grid_size_get(const Eo *obj, int *w, int *h); * the textgrid object. @c width and @c height can be @c null. On error, they * are set to 0. * - * See also @ref efl_text_font_set and + * See also @ref efl_text_font_size_set, @ref efl_text_font_family_set and * @ref evas_obj_textgrid_supported_font_styles_set * * @param[in] obj The object. diff --git a/src/lib/evas/canvas/evas_textgrid_eo.legacy.h b/src/lib/evas/canvas/evas_textgrid_eo.legacy.h index 9a99ce2bd3..379747e095 100644 --- a/src/lib/evas/canvas/evas_textgrid_eo.legacy.h +++ b/src/lib/evas/canvas/evas_textgrid_eo.legacy.h @@ -112,7 +112,7 @@ EAPI void evas_object_textgrid_size_get(const Evas_Textgrid *obj, int *w, int *h * the textgrid object. @c width and @c height can be @c null. On error, they * are set to 0. * - * See also @ref Efl.Text_Font.font.set and + * See also @ref efl_text_font_size_set, @ref efl_text_font_family_set and * @ref evas_object_textgrid_supported_font_styles_set * * @param[in] obj The object. |