summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorali <ali198724@gmail.com>2019-12-26 18:08:00 +0900
committerWooHyun Jung <wh0705.jung@samsung.com>2019-12-26 18:08:00 +0900
commit55e9d31569eabe313a60cc2ea2ccb103d52ab203 (patch)
tree7a3b14588778e0213bf365c7702caa0aeda70ef2
parent3bd4f04ec7392c7e4b745082303ac28fbfc2b2d6 (diff)
efl.text.font: rename to efl.text.font.properties
Reviewers: segfaultxavi, woohyun, zmike, bu5hm4n Subscribers: cedric, #reviewers, #committers Tags: #efl Maniphest Tasks: T7855 Differential Revision: https://phab.enlightenment.org/D10966
-rw-r--r--src/lib/edje/edje_part_text.c8
-rw-r--r--src/lib/edje/efl_canvas_layout_part_text.eo6
-rw-r--r--src/lib/efl/Efl.h2
-rw-r--r--src/lib/efl/interfaces/efl_interfaces_main.c2
-rw-r--r--src/lib/efl/interfaces/efl_text_font_properties.eo (renamed from src/lib/efl/interfaces/efl_text_font.eo)2
-rw-r--r--src/lib/efl/interfaces/meson.build2
-rw-r--r--src/lib/elementary/efl_text_interactive.eo2
-rw-r--r--src/lib/evas/canvas/efl_canvas_textblock.eo42
-rw-r--r--src/lib/evas/canvas/evas_object_textblock.c36
-rw-r--r--src/lib/evas/canvas/evas_text_eo.c2
-rw-r--r--src/lib/evas/canvas/evas_text_eo.hh4
-rw-r--r--src/lib/evas/canvas/evas_textgrid_eo.c2
-rw-r--r--src/lib/evas/canvas/evas_textgrid_eo.hh4
13 files changed, 57 insertions, 57 deletions
diff --git a/src/lib/edje/edje_part_text.c b/src/lib/edje/edje_part_text.c
index 575779e868..4c3e09161a 100644
--- a/src/lib/edje/edje_part_text.c
+++ b/src/lib/edje/edje_part_text.c
@@ -149,7 +149,7 @@ _efl_canvas_layout_part_text_efl_text_format_ellipsis_get(const Eo *obj,
149} 149}
150 150
151EOLIAN static void 151EOLIAN static void
152_efl_canvas_layout_part_text_efl_text_font_font_family_set(Eo *obj, 152_efl_canvas_layout_part_text_efl_text_font_properties_font_family_set(Eo *obj,
153 void *_pd EINA_UNUSED, const char *font) 153 void *_pd EINA_UNUSED, const char *font)
154{ 154{
155 Edje_User_Defined *eud; 155 Edje_User_Defined *eud;
@@ -165,7 +165,7 @@ _efl_canvas_layout_part_text_efl_text_font_font_family_set(Eo *obj,
165} 165}
166 166
167EOLIAN static const char * 167EOLIAN static const char *
168_efl_canvas_layout_part_text_efl_text_font_font_family_get(const Eo *obj, 168_efl_canvas_layout_part_text_efl_text_font_properties_font_family_get(const Eo *obj,
169 void *_pd EINA_UNUSED) 169 void *_pd EINA_UNUSED)
170{ 170{
171 PROXY_DATA_GET(obj, pd); 171 PROXY_DATA_GET(obj, pd);
@@ -175,7 +175,7 @@ _efl_canvas_layout_part_text_efl_text_font_font_family_get(const Eo *obj,
175} 175}
176 176
177EOLIAN static void 177EOLIAN static void
178_efl_canvas_layout_part_text_efl_text_font_font_size_set(Eo *obj, 178_efl_canvas_layout_part_text_efl_text_font_properties_font_size_set(Eo *obj,
179 void *_pd EINA_UNUSED, Efl_Font_Size size) 179 void *_pd EINA_UNUSED, Efl_Font_Size size)
180{ 180{
181 Edje_User_Defined *eud; 181 Edje_User_Defined *eud;
@@ -191,7 +191,7 @@ _efl_canvas_layout_part_text_efl_text_font_font_size_set(Eo *obj,
191} 191}
192 192
193EOLIAN static Efl_Font_Size 193EOLIAN static Efl_Font_Size
194_efl_canvas_layout_part_text_efl_text_font_font_size_get(const Eo *obj, 194_efl_canvas_layout_part_text_efl_text_font_properties_font_size_get(const Eo *obj,
195 void *_pd EINA_UNUSED) 195 void *_pd EINA_UNUSED)
196{ 196{
197 PROXY_DATA_GET(obj, pd); 197 PROXY_DATA_GET(obj, pd);
diff --git a/src/lib/edje/efl_canvas_layout_part_text.eo b/src/lib/edje/efl_canvas_layout_part_text.eo
index ed3cc4ec04..a593424062 100644
--- a/src/lib/edje/efl_canvas_layout_part_text.eo
+++ b/src/lib/edje/efl_canvas_layout_part_text.eo
@@ -11,7 +11,7 @@ enum @beta Efl.Canvas.Layout_Part_Text_Expand
11} 11}
12 12
13class @beta Efl.Canvas.Layout_Part_Text extends Efl.Canvas.Layout_Part implements Efl.Text, 13class @beta Efl.Canvas.Layout_Part_Text extends Efl.Canvas.Layout_Part implements Efl.Text,
14Efl.Text_Markup, Efl.Text_Format, Efl.Text_Font, Efl.Text_Style 14Efl.Text_Markup, Efl.Text_Format, Efl.Text.Font.Properties, Efl.Text_Style
15{ 15{
16 [[Represents a TEXT part of a layout 16 [[Represents a TEXT part of a layout
17 17
@@ -38,8 +38,8 @@ Efl.Text_Markup, Efl.Text_Format, Efl.Text_Font, Efl.Text_Style
38 Efl.Text_Markup.markup { get; set; } 38 Efl.Text_Markup.markup { get; set; }
39 Efl.Text_Format.ellipsis { set; get; } 39 Efl.Text_Format.ellipsis { set; get; }
40 Efl.Text_Format.wrap { set; get; } 40 Efl.Text_Format.wrap { set; get; }
41 Efl.Text_Font.font_family { set; get; } 41 Efl.Text.Font.Properties.font_family { set; get; }
42 Efl.Text_Font.font_size { set; get; } 42 Efl.Text.Font.Properties.font_size { set; get; }
43 Efl.Text_Style.text_color { set; get; } 43 Efl.Text_Style.text_color { set; get; }
44 Efl.Text_Style.text_background_type { set; get; } 44 Efl.Text_Style.text_background_type { set; get; }
45 Efl.Text_Style.text_background_color { set; get;} 45 Efl.Text_Style.text_background_color { set; get;}
diff --git a/src/lib/efl/Efl.h b/src/lib/efl/Efl.h
index 0c4b649730..649383f2c9 100644
--- a/src/lib/efl/Efl.h
+++ b/src/lib/efl/Efl.h
@@ -207,7 +207,7 @@ typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command;
207#include "interfaces/efl_io_queue.eo.h" 207#include "interfaces/efl_io_queue.eo.h"
208 208
209/* Text interfaces */ 209/* Text interfaces */
210#include "interfaces/efl_text_font.eo.h" 210#include "interfaces/efl_text_font_properties.eo.h"
211#include "interfaces/efl_text_style.eo.h" 211#include "interfaces/efl_text_style.eo.h"
212#include "interfaces/efl_text_format.eo.h" 212#include "interfaces/efl_text_format.eo.h"
213#include "interfaces/efl_text_markup.eo.h" 213#include "interfaces/efl_text_markup.eo.h"
diff --git a/src/lib/efl/interfaces/efl_interfaces_main.c b/src/lib/efl/interfaces/efl_interfaces_main.c
index 8635ed5778..d7fab5fcf8 100644
--- a/src/lib/efl/interfaces/efl_interfaces_main.c
+++ b/src/lib/efl/interfaces/efl_interfaces_main.c
@@ -21,7 +21,7 @@
21#include "interfaces/efl_player.eo.c" 21#include "interfaces/efl_player.eo.c"
22#include "interfaces/efl_audio_control.eo.c" 22#include "interfaces/efl_audio_control.eo.c"
23#include "interfaces/efl_text.eo.c" 23#include "interfaces/efl_text.eo.c"
24#include "interfaces/efl_text_font.eo.c" 24#include "interfaces/efl_text_font_properties.eo.c"
25#include "interfaces/efl_text_style.eo.c" 25#include "interfaces/efl_text_style.eo.c"
26#include "interfaces/efl_text_format.eo.c" 26#include "interfaces/efl_text_format.eo.c"
27#include "interfaces/efl_text_markup.eo.c" 27#include "interfaces/efl_text_markup.eo.c"
diff --git a/src/lib/efl/interfaces/efl_text_font.eo b/src/lib/efl/interfaces/efl_text_font_properties.eo
index dce81a7e10..796a020324 100644
--- a/src/lib/efl/interfaces/efl_text_font.eo
+++ b/src/lib/efl/interfaces/efl_text_font_properties.eo
@@ -46,7 +46,7 @@ enum @beta Efl.Text_Font_Bitmap_Scalable {
46 color = (1 << 0), [[Enable scalable feature for color bitmap fonts.]] 46 color = (1 << 0), [[Enable scalable feature for color bitmap fonts.]]
47} 47}
48 48
49interface @beta Efl.Text_Font { 49interface @beta Efl.Text.Font.Properties {
50 [[Font settings for text. 50 [[Font settings for text.
51 ]] 51 ]]
52 c_prefix: efl_text; 52 c_prefix: efl_text;
diff --git a/src/lib/efl/interfaces/meson.build b/src/lib/efl/interfaces/meson.build
index c5bad7e54e..76e9fb5d07 100644
--- a/src/lib/efl/interfaces/meson.build
+++ b/src/lib/efl/interfaces/meson.build
@@ -40,7 +40,7 @@ pub_eo_files = [
40 'efl_player.eo', 40 'efl_player.eo',
41 'efl_audio_control.eo', 41 'efl_audio_control.eo',
42 'efl_text.eo', 42 'efl_text.eo',
43 'efl_text_font.eo', 43 'efl_text_font_properties.eo',
44 'efl_text_style.eo', 44 'efl_text_style.eo',
45 'efl_text_format.eo', 45 'efl_text_format.eo',
46 'efl_text_markup.eo', 46 'efl_text_markup.eo',
diff --git a/src/lib/elementary/efl_text_interactive.eo b/src/lib/elementary/efl_text_interactive.eo
index fe283aa1e0..85b5a811d7 100644
--- a/src/lib/elementary/efl_text_interactive.eo
+++ b/src/lib/elementary/efl_text_interactive.eo
@@ -1,6 +1,6 @@
1import efl_text_types; 1import efl_text_types;
2 2
3interface @beta Efl.Text_Interactive extends Efl.Text, Efl.Text_Font, 3interface @beta Efl.Text_Interactive extends Efl.Text, Efl.Text.Font.Properties,
4 Efl.Text_Format, Efl.Text_Style 4 Efl.Text_Format, Efl.Text_Style
5{ 5{
6 [[Interface for interactive (editable) text inputs (text entries). 6 [[Interface for interactive (editable) text inputs (text entries).
diff --git a/src/lib/evas/canvas/efl_canvas_textblock.eo b/src/lib/evas/canvas/efl_canvas_textblock.eo
index 7ea9609836..724103040a 100644
--- a/src/lib/evas/canvas/efl_canvas_textblock.eo
+++ b/src/lib/evas/canvas/efl_canvas_textblock.eo
@@ -1,7 +1,7 @@
1import efl_text_types; 1import efl_text_types;
2 2
3class @beta Efl.Canvas.Textblock extends Efl.Canvas.Object implements Efl.Text, 3class @beta Efl.Canvas.Textblock extends Efl.Canvas.Object implements Efl.Text,
4 Efl.Canvas.Filter.Internal, Efl.Text_Font, 4 Efl.Canvas.Filter.Internal, Efl.Text.Font.Properties,
5 Efl.Text_Style, Efl.Text_Format, 5 Efl.Text_Style, Efl.Text_Format,
6 Efl.Text_Markup, Efl.Ui.I18n 6 Efl.Text_Markup, Efl.Ui.I18n
7{ 7{
@@ -9,7 +9,7 @@ class @beta Efl.Canvas.Textblock extends Efl.Canvas.Object implements Efl.Text,
9 if you need user interaction consider the classes in $[Efl.Ui]. 9 if you need user interaction consider the classes in $[Efl.Ui].
10 10
11 Note: No text will be rendered until a font, a font size and a font color are specified. 11 Note: No text will be rendered until a font, a font size and a font color are specified.
12 This can be accomplished using @Efl.Text_Font.font_family, @Efl.Text_Font.font_size and 12 This can be accomplished using @Efl.Text.Font.Properties.font_family, @Efl.Text.Font.Properties.font_size and
13 @Efl.Text_Style.text_color. 13 @Efl.Text_Style.text_color.
14 Alternatively, @.style_apply can be used providing the attributes $font, $font_size and $color. 14 Alternatively, @.style_apply can be used providing the attributes $font, $font_size and $color.
15 ]] 15 ]]
@@ -92,7 +92,7 @@ class @beta Efl.Canvas.Textblock extends Efl.Canvas.Object implements Efl.Text,
92 [[Applies several style attributes at once using a formatting string. 92 [[Applies several style attributes at once using a formatting string.
93 Given style attributes override previous values, leaving other attributes unaffected. 93 Given style attributes override previous values, leaving other attributes unaffected.
94 This is akin to setting individual style attributes using properties like 94 This is akin to setting individual style attributes using properties like
95 @Efl.Text_Font.font_slant or @Efl.Text_Format.wrap, for example. 95 @Efl.Text.Font.Properties.font_slant or @Efl.Text_Format.wrap, for example.
96 96
97 The formatting string is a whitespace-separated list of $[attribute=value] pairs. 97 The formatting string is a whitespace-separated list of $[attribute=value] pairs.
98 98
@@ -101,43 +101,43 @@ class @beta Efl.Canvas.Textblock extends Efl.Canvas.Object implements Efl.Text,
101 - $font: Name of the font to use. 101 - $font: Name of the font to use.
102 Default value is empty, meaning that no text will be rendered. 102 Default value is empty, meaning that no text will be rendered.
103 Requires $font_size and $font_color. 103 Requires $font_size and $font_color.
104 See @Efl.Text_Font.font_family. 104 See @Efl.Text.Font.Properties.font_family.
105 105
106 - $font_fallbacks: Comma-delimited list of fonts to try if finding the primary font fails. 106 - $font_fallbacks: Comma-delimited list of fonts to try if finding the primary font fails.
107 Example: $[font_fallbacks=consolas,courier,monospace]. 107 Example: $[font_fallbacks=consolas,courier,monospace].
108 Default value is empty. 108 Default value is empty.
109 See @Efl.Text_Font.font_fallbacks. 109 See @Efl.Text.Font.Properties.font_fallbacks.
110 110
111 - $font_size: Height of font, in points. 111 - $font_size: Height of font, in points.
112 Default value is 0. 112 Default value is 0.
113 Requires $font and $font_color. 113 Requires $font and $font_color.
114 See @Efl.Text_Font.font_size. 114 See @Efl.Text.Font.Properties.font_size.
115 115
116 - $font_source: Path to the file containing the font to use. 116 - $font_source: Path to the file containing the font to use.
117 Example: $[font_source=/usr/share/fonts/Sans.ttf]. 117 Example: $[font_source=/usr/share/fonts/Sans.ttf].
118 Default value is empty. 118 Default value is empty.
119 See @Efl.Text_Font.font_source. 119 See @Efl.Text.Font.Properties.font_source.
120 120
121 - $font_weight: Thickness of the font. The value must be one of: $normal, $thin, $ultralight, $extralight, 121 - $font_weight: Thickness of the font. The value must be one of: $normal, $thin, $ultralight, $extralight,
122 $light, $book, $medium, $semibold, $bold, $ultrabold, $extrabold, $black and $extrablack. 122 $light, $book, $medium, $semibold, $bold, $ultrabold, $extrabold, $black and $extrablack.
123 Default value is $normal. 123 Default value is $normal.
124 See @Efl.Text_Font.font_weight. 124 See @Efl.Text.Font.Properties.font_weight.
125 125
126 - $font_style: Style of the font. The value must be one of: $normal, $oblique and $italic. 126 - $font_style: Style of the font. The value must be one of: $normal, $oblique and $italic.
127 Default value is $normal. 127 Default value is $normal.
128 See @Efl.Text_Font.font_slant. 128 See @Efl.Text.Font.Properties.font_slant.
129 129
130 - $font_width: How wide the font is, relative to its height. The value must be one of: 130 - $font_width: How wide the font is, relative to its height. The value must be one of:
131 $normal, $ultracondensed, $extracondensed, $condensed, $semicondensed, $semiexpanded, $expanded, 131 $normal, $ultracondensed, $extracondensed, $condensed, $semicondensed, $semiexpanded, $expanded,
132 $extraexpanded and $ultraexpanded. 132 $extraexpanded and $ultraexpanded.
133 Default value is $normal. 133 Default value is $normal.
134 See @Efl.Text_Font.font_weight. 134 See @Efl.Text.Font.Properties.font_weight.
135 135
136 - $lang: A 2-letter ISO 639-1 language code, $auto (to use the system locale setting) or $none (to disable 136 - $lang: A 2-letter ISO 639-1 language code, $auto (to use the system locale setting) or $none (to disable
137 language support). 137 language support).
138 Example: $[lang=he]. 138 Example: $[lang=he].
139 Default value is empty. 139 Default value is empty.
140 See @Efl.Text_Font.font_lang. 140 See @Efl.Text.Font.Properties.font_lang.
141 141
142 - $color: Color code for the text (See bottom for the complete list of supported codes). 142 - $color: Color code for the text (See bottom for the complete list of supported codes).
143 Default value is $[rgba(0,0,0,0)] meaning that no text will be rendered. 143 Default value is $[rgba(0,0,0,0)] meaning that no text will be rendered.
@@ -340,7 +340,7 @@ class @beta Efl.Canvas.Textblock extends Efl.Canvas.Object implements Efl.Text,
340 @property all_styles { 340 @property all_styles {
341 [[A string representing the complete set of attributes applied to this text object. 341 [[A string representing the complete set of attributes applied to this text object.
342 This includes the default attributes plus any additional style applied with @.style_apply 342 This includes the default attributes plus any additional style applied with @.style_apply
343 or individual style properties like @Efl.Text_Font.font_slant or @Efl.Text_Format.wrap. 343 or individual style properties like @Efl.Text.Font.Properties.font_slant or @Efl.Text_Format.wrap.
344 344
345 See @.style_apply for the description of all attributes. 345 See @.style_apply for the description of all attributes.
346 ]] 346 ]]
@@ -455,15 +455,15 @@ class @beta Efl.Canvas.Textblock extends Efl.Canvas.Object implements Efl.Text,
455 Efl.Canvas.Filter.Internal.filter_dirty; 455 Efl.Canvas.Filter.Internal.filter_dirty;
456 Efl.Canvas.Filter.Internal.filter_input_render; 456 Efl.Canvas.Filter.Internal.filter_input_render;
457 Efl.Canvas.Filter.Internal.filter_state_prepare; 457 Efl.Canvas.Filter.Internal.filter_state_prepare;
458 Efl.Text_Font.font_family { get; set; } 458 Efl.Text.Font.Properties.font_family { get; set; }
459 Efl.Text_Font.font_size { get; set; } 459 Efl.Text.Font.Properties.font_size { get; set; }
460 Efl.Text_Font.font_source { get; set; } 460 Efl.Text.Font.Properties.font_source { get; set; }
461 Efl.Text_Font.font_fallbacks { get; set; } 461 Efl.Text.Font.Properties.font_fallbacks { get; set; }
462 Efl.Text_Font.font_lang { get; set; } 462 Efl.Text.Font.Properties.font_lang { get; set; }
463 Efl.Text_Font.font_weight { get; set; } 463 Efl.Text.Font.Properties.font_weight { get; set; }
464 Efl.Text_Font.font_slant { get; set; } 464 Efl.Text.Font.Properties.font_slant { get; set; }
465 Efl.Text_Font.font_width { get; set; } 465 Efl.Text.Font.Properties.font_width { get; set; }
466 Efl.Text_Font.font_bitmap_scalable { get; set; } 466 Efl.Text.Font.Properties.font_bitmap_scalable { get; set; }
467 Efl.Text_Style.text_color { get; set; } 467 Efl.Text_Style.text_color { get; set; }
468 Efl.Text_Style.text_background_type { get; set; } 468 Efl.Text_Style.text_background_type { get; set; }
469 Efl.Text_Style.text_background_color { get; set; } 469 Efl.Text_Style.text_background_color { get; set; }
diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c
index 03d4a4bdc7..48857a5a32 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -16140,7 +16140,7 @@ _canvas_text_format_changed(Eo *eo_obj, Efl_Canvas_Textblock_Data *o)
16140/* Efl.Text.Font interface implementation */ 16140/* Efl.Text.Font interface implementation */
16141 16141
16142static void 16142static void
16143_efl_canvas_textblock_efl_text_font_font_family_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, const char *font) 16143_efl_canvas_textblock_efl_text_font_properties_font_family_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, const char *font)
16144{ 16144{
16145 ASYNC_BLOCK; 16145 ASYNC_BLOCK;
16146 Eina_Bool changed = EINA_FALSE; 16146 Eina_Bool changed = EINA_FALSE;
@@ -16172,13 +16172,13 @@ _efl_canvas_textblock_efl_text_font_font_family_set(Eo *obj EINA_UNUSED, Efl_Can
16172} 16172}
16173 16173
16174static const char * 16174static const char *
16175_efl_canvas_textblock_efl_text_font_font_family_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o) 16175_efl_canvas_textblock_efl_text_font_properties_font_family_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o)
16176{ 16176{
16177 return o->default_format.info.font; 16177 return o->default_format.info.font;
16178} 16178}
16179 16179
16180static void 16180static void
16181_efl_canvas_textblock_efl_text_font_font_size_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o, int size) 16181_efl_canvas_textblock_efl_text_font_properties_font_size_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o, int size)
16182{ 16182{
16183 ASYNC_BLOCK; 16183 ASYNC_BLOCK;
16184 EINA_SAFETY_ON_FALSE_RETURN(size > 0); 16184 EINA_SAFETY_ON_FALSE_RETURN(size > 0);
@@ -16190,13 +16190,13 @@ _efl_canvas_textblock_efl_text_font_font_size_set(Eo *obj EINA_UNUSED, Efl_Canva
16190} 16190}
16191 16191
16192static Efl_Font_Size 16192static Efl_Font_Size
16193_efl_canvas_textblock_efl_text_font_font_size_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o) 16193_efl_canvas_textblock_efl_text_font_properties_font_size_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o)
16194{ 16194{
16195 return o->default_format.info.size; 16195 return o->default_format.info.size;
16196} 16196}
16197 16197
16198static void 16198static void
16199_efl_canvas_textblock_efl_text_font_font_source_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, const char *font_source EINA_UNUSED) 16199_efl_canvas_textblock_efl_text_font_properties_font_source_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, const char *font_source EINA_UNUSED)
16200{ 16200{
16201 Eina_Stringshare *nfont_source; 16201 Eina_Stringshare *nfont_source;
16202 if (o->default_format.info.font_source != font_source) 16202 if (o->default_format.info.font_source != font_source)
@@ -16217,13 +16217,13 @@ _efl_canvas_textblock_efl_text_font_font_source_set(Eo *obj EINA_UNUSED, Efl_Can
16217} 16217}
16218 16218
16219static const char* 16219static const char*
16220_efl_canvas_textblock_efl_text_font_font_source_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED) 16220_efl_canvas_textblock_efl_text_font_properties_font_source_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
16221{ 16221{
16222 return _FMT_INFO(font_source); 16222 return _FMT_INFO(font_source);
16223} 16223}
16224 16224
16225static void 16225static void
16226_efl_canvas_textblock_efl_text_font_font_fallbacks_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, const char *font_fallbacks EINA_UNUSED) 16226_efl_canvas_textblock_efl_text_font_properties_font_fallbacks_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, const char *font_fallbacks EINA_UNUSED)
16227{ 16227{
16228 Eina_Stringshare *nfont_fallbacks; 16228 Eina_Stringshare *nfont_fallbacks;
16229 if (o->default_format.info.font_fallbacks != font_fallbacks) 16229 if (o->default_format.info.font_fallbacks != font_fallbacks)
@@ -16244,13 +16244,13 @@ _efl_canvas_textblock_efl_text_font_font_fallbacks_set(Eo *obj EINA_UNUSED, Efl_
16244} 16244}
16245 16245
16246static const char* 16246static const char*
16247_efl_canvas_textblock_efl_text_font_font_fallbacks_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED) 16247_efl_canvas_textblock_efl_text_font_properties_font_fallbacks_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
16248{ 16248{
16249 return _FMT_INFO(font_fallbacks); 16249 return _FMT_INFO(font_fallbacks);
16250} 16250}
16251 16251
16252static void 16252static void
16253_efl_canvas_textblock_efl_text_font_font_lang_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, const char *font_lang EINA_UNUSED) 16253_efl_canvas_textblock_efl_text_font_properties_font_lang_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, const char *font_lang EINA_UNUSED)
16254{ 16254{
16255 if (_FMT_INFO(font_lang) != font_lang) 16255 if (_FMT_INFO(font_lang) != font_lang)
16256 { 16256 {
@@ -16262,13 +16262,13 @@ _efl_canvas_textblock_efl_text_font_font_lang_set(Eo *obj EINA_UNUSED, Efl_Canva
16262} 16262}
16263 16263
16264static const char* 16264static const char*
16265_efl_canvas_textblock_efl_text_font_font_lang_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED) 16265_efl_canvas_textblock_efl_text_font_properties_font_lang_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
16266{ 16266{
16267 return _FMT_INFO(font_lang); 16267 return _FMT_INFO(font_lang);
16268} 16268}
16269 16269
16270static void 16270static void
16271_efl_canvas_textblock_efl_text_font_font_weight_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Font_Weight font_weight EINA_UNUSED) 16271_efl_canvas_textblock_efl_text_font_properties_font_weight_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Font_Weight font_weight EINA_UNUSED)
16272{ 16272{
16273 if (_FMT_INFO(font_weight) == font_weight) return; 16273 if (_FMT_INFO(font_weight) == font_weight) return;
16274 _FMT_INFO(font_weight) = font_weight; 16274 _FMT_INFO(font_weight) = font_weight;
@@ -16276,13 +16276,13 @@ _efl_canvas_textblock_efl_text_font_font_weight_set(Eo *obj EINA_UNUSED, Efl_Can
16276} 16276}
16277 16277
16278static Efl_Text_Font_Weight 16278static Efl_Text_Font_Weight
16279_efl_canvas_textblock_efl_text_font_font_weight_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED) 16279_efl_canvas_textblock_efl_text_font_properties_font_weight_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
16280{ 16280{
16281 return _FMT_INFO(font_weight); 16281 return _FMT_INFO(font_weight);
16282} 16282}
16283 16283
16284static void 16284static void
16285_efl_canvas_textblock_efl_text_font_font_slant_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Font_Slant font_slant EINA_UNUSED) 16285_efl_canvas_textblock_efl_text_font_properties_font_slant_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Font_Slant font_slant EINA_UNUSED)
16286{ 16286{
16287 ASYNC_BLOCK; 16287 ASYNC_BLOCK;
16288 if (_FMT_INFO(font_slant) == font_slant) return; 16288 if (_FMT_INFO(font_slant) == font_slant) return;
@@ -16291,13 +16291,13 @@ _efl_canvas_textblock_efl_text_font_font_slant_set(Eo *obj EINA_UNUSED, Efl_Canv
16291} 16291}
16292 16292
16293static Efl_Text_Font_Slant 16293static Efl_Text_Font_Slant
16294_efl_canvas_textblock_efl_text_font_font_slant_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED) 16294_efl_canvas_textblock_efl_text_font_properties_font_slant_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
16295{ 16295{
16296 return _FMT_INFO(font_slant); 16296 return _FMT_INFO(font_slant);
16297} 16297}
16298 16298
16299static void 16299static void
16300_efl_canvas_textblock_efl_text_font_font_width_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Font_Width font_width EINA_UNUSED) 16300_efl_canvas_textblock_efl_text_font_properties_font_width_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Font_Width font_width EINA_UNUSED)
16301{ 16301{
16302 ASYNC_BLOCK; 16302 ASYNC_BLOCK;
16303 if (_FMT_INFO(font_width) == font_width) return; 16303 if (_FMT_INFO(font_width) == font_width) return;
@@ -16306,13 +16306,13 @@ _efl_canvas_textblock_efl_text_font_font_width_set(Eo *obj EINA_UNUSED, Efl_Canv
16306} 16306}
16307 16307
16308static Efl_Text_Font_Width 16308static Efl_Text_Font_Width
16309_efl_canvas_textblock_efl_text_font_font_width_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED) 16309_efl_canvas_textblock_efl_text_font_properties_font_width_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
16310{ 16310{
16311 return _FMT_INFO(font_width); 16311 return _FMT_INFO(font_width);
16312} 16312}
16313 16313
16314EOLIAN static void 16314EOLIAN static void
16315_efl_canvas_textblock_efl_text_font_font_bitmap_scalable_set(Eo *obj, Efl_Canvas_Textblock_Data *o, Efl_Text_Font_Bitmap_Scalable bitmap_scalable) 16315_efl_canvas_textblock_efl_text_font_properties_font_bitmap_scalable_set(Eo *obj, Efl_Canvas_Textblock_Data *o, Efl_Text_Font_Bitmap_Scalable bitmap_scalable)
16316{ 16316{
16317 if (_FMT_INFO(bitmap_scalable) == bitmap_scalable) return; 16317 if (_FMT_INFO(bitmap_scalable) == bitmap_scalable) return;
16318 _FMT_INFO(bitmap_scalable) = bitmap_scalable; 16318 _FMT_INFO(bitmap_scalable) = bitmap_scalable;
@@ -16320,7 +16320,7 @@ _efl_canvas_textblock_efl_text_font_font_bitmap_scalable_set(Eo *obj, Efl_Canvas
16320} 16320}
16321 16321
16322EOLIAN static Efl_Text_Font_Bitmap_Scalable 16322EOLIAN static Efl_Text_Font_Bitmap_Scalable
16323_efl_canvas_textblock_efl_text_font_font_bitmap_scalable_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o) 16323_efl_canvas_textblock_efl_text_font_properties_font_bitmap_scalable_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o)
16324{ 16324{
16325 return _FMT_INFO(bitmap_scalable); 16325 return _FMT_INFO(bitmap_scalable);
16326} 16326}
diff --git a/src/lib/evas/canvas/evas_text_eo.c b/src/lib/evas/canvas/evas_text_eo.c
index 0dde4eb3c7..b2139f82d1 100644
--- a/src/lib/evas/canvas/evas_text_eo.c
+++ b/src/lib/evas/canvas/evas_text_eo.c
@@ -293,6 +293,6 @@ static const Efl_Class_Description _evas_text_class_desc = {
293 NULL 293 NULL
294}; 294};
295 295
296EFL_DEFINE_CLASS(evas_text_class_get, &_evas_text_class_desc, EFL_CANVAS_OBJECT_CLASS, EFL_TEXT_INTERFACE, EFL_TEXT_FONT_INTERFACE, EFL_CANVAS_FILTER_INTERNAL_MIXIN, NULL); 296EFL_DEFINE_CLASS(evas_text_class_get, &_evas_text_class_desc, EFL_CANVAS_OBJECT_CLASS, EFL_TEXT_INTERFACE, EFL_TEXT_FONT_PROPERTIES_INTERFACE, EFL_CANVAS_FILTER_INTERNAL_MIXIN, NULL);
297 297
298#include "evas_text_eo.legacy.c" 298#include "evas_text_eo.legacy.c"
diff --git a/src/lib/evas/canvas/evas_text_eo.hh b/src/lib/evas/canvas/evas_text_eo.hh
index 8d04c94fbe..f3665f7cee 100644
--- a/src/lib/evas/canvas/evas_text_eo.hh
+++ b/src/lib/evas/canvas/evas_text_eo.hh
@@ -23,7 +23,7 @@ extern "C" {
23#include "efl_loop_consumer.eo.h" 23#include "efl_loop_consumer.eo.h"
24#include "efl_object.eo.h" 24#include "efl_object.eo.h"
25#include "efl_text.eo.h" 25#include "efl_text.eo.h"
26#include "efl_text_font.eo.h" 26#include "efl_text_font_properties.eo.h"
27#include "efl_ui_i18n.eo.h" 27#include "efl_ui_i18n.eo.h"
28#include "evas_text_eo.h" 28#include "evas_text_eo.h"
29} 29}
@@ -49,7 +49,7 @@ extern "C" {
49#include "efl_loop_consumer.eo.hh" 49#include "efl_loop_consumer.eo.hh"
50#include "efl_object.eo.hh" 50#include "efl_object.eo.hh"
51#include "efl_text.eo.hh" 51#include "efl_text.eo.hh"
52#include "efl_text_font.eo.hh" 52#include "efl_text_font_properties.eo.hh"
53#include "efl_ui_i18n.eo.hh" 53#include "efl_ui_i18n.eo.hh"
54#ifndef EVAS_TEXT_FWD_GUARD 54#ifndef EVAS_TEXT_FWD_GUARD
55#define EVAS_TEXT_FWD_GUARD 55#define EVAS_TEXT_FWD_GUARD
diff --git a/src/lib/evas/canvas/evas_textgrid_eo.c b/src/lib/evas/canvas/evas_textgrid_eo.c
index 306ea8af00..bbe4614766 100644
--- a/src/lib/evas/canvas/evas_textgrid_eo.c
+++ b/src/lib/evas/canvas/evas_textgrid_eo.c
@@ -122,6 +122,6 @@ static const Efl_Class_Description _evas_textgrid_class_desc = {
122 NULL 122 NULL
123}; 123};
124 124
125EFL_DEFINE_CLASS(evas_textgrid_class_get, &_evas_textgrid_class_desc, EFL_CANVAS_OBJECT_CLASS, EFL_TEXT_FONT_INTERFACE, NULL); 125EFL_DEFINE_CLASS(evas_textgrid_class_get, &_evas_textgrid_class_desc, EFL_CANVAS_OBJECT_CLASS, EFL_TEXT_FONT_PROPERTIES_INTERFACE, NULL);
126 126
127#include "evas_textgrid_eo.legacy.c" 127#include "evas_textgrid_eo.legacy.c"
diff --git a/src/lib/evas/canvas/evas_textgrid_eo.hh b/src/lib/evas/canvas/evas_textgrid_eo.hh
index 4d7ef1ee9d..5d771db3ff 100644
--- a/src/lib/evas/canvas/evas_textgrid_eo.hh
+++ b/src/lib/evas/canvas/evas_textgrid_eo.hh
@@ -20,7 +20,7 @@ extern "C" {
20#include "efl_loop.eo.h" 20#include "efl_loop.eo.h"
21#include "efl_loop_consumer.eo.h" 21#include "efl_loop_consumer.eo.h"
22#include "efl_object.eo.h" 22#include "efl_object.eo.h"
23#include "efl_text_font.eo.h" 23#include "efl_text_font_properties.eo.h"
24#include "efl_ui_i18n.eo.h" 24#include "efl_ui_i18n.eo.h"
25#include "evas_textgrid_eo.h" 25#include "evas_textgrid_eo.h"
26} 26}
@@ -43,7 +43,7 @@ extern "C" {
43#include "efl_loop.eo.hh" 43#include "efl_loop.eo.hh"
44#include "efl_loop_consumer.eo.hh" 44#include "efl_loop_consumer.eo.hh"
45#include "efl_object.eo.hh" 45#include "efl_object.eo.hh"
46#include "efl_text_font.eo.hh" 46#include "efl_text_font_properties.eo.hh"
47#include "efl_ui_i18n.eo.hh" 47#include "efl_ui_i18n.eo.hh"
48#ifndef EVAS_TEXTGRID_FWD_GUARD 48#ifndef EVAS_TEXTGRID_FWD_GUARD
49#define EVAS_TEXTGRID_FWD_GUARD 49#define EVAS_TEXTGRID_FWD_GUARD