summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorali <ali198724@gmail.com>2019-12-20 09:49:41 +0100
committerXavi Artigas <xavierartigas@yahoo.es>2019-12-20 09:58:27 +0100
commit5cf7fa7670a3160ad01171116b392a3a6757463f (patch)
tree6c54d4eac560d9b0a62ab3d9714548a1fe6de8fa
parente16b32c37643d3243b2350df053474d84717c2a2 (diff)
efl.text.style: rename methods/properties and add text_ prefix
Summary: efl.text.style: rename methods and properties this change will avoid conflict in the future with other interfaces or class methods. ``` Efl.Text_Style.text_color { set; get; } Efl.Text_Style.text_backing_type { set; get; } Efl.Text_Style.text_background_color { set; get;} //this was backing_color Efl.Text_Style.text_underline_type { set; } Efl.Text_Style.text_underline_color { set; get; } Efl.Text_Style.text_underline2_color { set; get; } Efl.Text_Style.text_underline_dashed_color { set; get; } Efl.Text_Style.text_underline_height { set; } Efl.Text_Style.text_underline_dashed_width { set; } Efl.Text_Style.text_underline_dashed_gap { set; } Efl.Text_Style.text_strikethrough_type { set; } Efl.Text_Style.text_strikethrough_color { set; get; } Efl.Text_Style.text_effect_type { set; } Efl.Text_Style.text_shadow_direction { set; } Efl.Text_Style.text_outline_color { set; get; } Efl.Text_Style.text_shadow_color { set; get; } Efl.Text_Style.text_glow_color { set; get; } Efl.Text_Style.text_glow2_color { set; get; } ``` T8533 Reviewers: woohyun, segfaultxavi, bu5hm4n, zmike, cedric Reviewed By: segfaultxavi Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D10897
-rw-r--r--src/bin/elementary/test_efl_ui_text.c2
-rw-r--r--src/bin/elementary/test_photocam.c2
-rw-r--r--src/examples/elementary/efl_canvas_layout_text.c2
-rw-r--r--src/lib/edje/edje_part_text.c100
-rw-r--r--src/lib/edje/edje_private.h2
-rw-r--r--src/lib/edje/efl_canvas_layout_part_text.eo36
-rw-r--r--src/lib/efl/interfaces/efl_text_style.eo62
-rw-r--r--src/lib/elementary/efl_ui_textbox.c4
-rw-r--r--src/lib/evas/canvas/efl_canvas_textblock.eo74
-rw-r--r--src/lib/evas/canvas/evas_object_textblock.c78
-rw-r--r--src/tests/edje/edje_test_text.c10
-rw-r--r--src/tests/evas/evas_test_textblock.c4
12 files changed, 189 insertions, 187 deletions
diff --git a/src/bin/elementary/test_efl_ui_text.c b/src/bin/elementary/test_efl_ui_text.c
index 066e73295a..1d098c1052 100644
--- a/src/bin/elementary/test_efl_ui_text.c
+++ b/src/bin/elementary/test_efl_ui_text.c
@@ -166,7 +166,7 @@ test_efl_ui_text(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
166 efl_text_font_family_set(en, "Sans"); 166 efl_text_font_family_set(en, "Sans");
167 efl_text_font_size_set(en, 12); 167 efl_text_font_size_set(en, 12);
168 efl_text_font_width_set(en, EFL_TEXT_FONT_WIDTH_ULTRACONDENSED); 168 efl_text_font_width_set(en, EFL_TEXT_FONT_WIDTH_ULTRACONDENSED);
169 efl_text_normal_color_set(en, 255, 255, 255, 255); 169 efl_text_color_set(en, 255, 255, 255, 255);
170 170
171 efl_text_set(en, 171 efl_text_set(en,
172 "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod\n" 172 "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod\n"
diff --git a/src/bin/elementary/test_photocam.c b/src/bin/elementary/test_photocam.c
index 166f669a42..de7b827a84 100644
--- a/src/bin/elementary/test_photocam.c
+++ b/src/bin/elementary/test_photocam.c
@@ -819,7 +819,7 @@ test_image_zoomable_animated(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSE
819 efl_gfx_hint_weight_set(efl_added, 1, 0), 819 efl_gfx_hint_weight_set(efl_added, 1, 0),
820 efl_text_font_family_set(efl_added, "Sans"), 820 efl_text_font_family_set(efl_added, "Sans"),
821 efl_text_font_size_set(efl_added, 10), 821 efl_text_font_size_set(efl_added, 10),
822 efl_text_normal_color_set(efl_added, 255, 255, 255, 255), 822 efl_text_color_set(efl_added, 255, 255, 255, 255),
823 efl_pack(bx, efl_added) 823 efl_pack(bx, efl_added)
824 ); 824 );
825 825
diff --git a/src/examples/elementary/efl_canvas_layout_text.c b/src/examples/elementary/efl_canvas_layout_text.c
index bafd0dd2e5..268dd487d0 100644
--- a/src/examples/elementary/efl_canvas_layout_text.c
+++ b/src/examples/elementary/efl_canvas_layout_text.c
@@ -134,7 +134,7 @@ efl_main(void *data EINA_UNUSED,
134 134
135 efl_text_markup_set(efl_part(layout, "text"), "This is an example text. This is a layout text part."); 135 efl_text_markup_set(efl_part(layout, "text"), "This is an example text. This is a layout text part.");
136 efl_text_wrap_set(efl_part(layout, "text"), wraps[wrap_itr].wrap); 136 efl_text_wrap_set(efl_part(layout, "text"), wraps[wrap_itr].wrap);
137 efl_text_normal_color_set(efl_part(layout, "text"), 255, 255, 0, 255); 137 efl_text_color_set(efl_part(layout, "text"), 255, 255, 0, 255);
138 efl_text_font_family_set(efl_part(layout, "text"), "Serif"); 138 efl_text_font_family_set(efl_part(layout, "text"), "Serif");
139 efl_text_font_size_set(efl_part(layout, "text"), 12); 139 efl_text_font_size_set(efl_part(layout, "text"), 12);
140 140
diff --git a/src/lib/edje/edje_part_text.c b/src/lib/edje/edje_part_text.c
index 876c4ab7af..575779e868 100644
--- a/src/lib/edje/edje_part_text.c
+++ b/src/lib/edje/edje_part_text.c
@@ -41,9 +41,9 @@ _efl_canvas_layout_part_text_efl_text_markup_markup_set(Eo *obj,
41/* More Efl.Text.* API (@since 1.22) */ 41/* More Efl.Text.* API (@since 1.22) */
42 42
43EOLIAN static void 43EOLIAN static void
44_efl_canvas_layout_part_text_efl_text_style_backing_type_set(Eo *obj, 44_efl_canvas_layout_part_text_efl_text_style_text_background_type_set(Eo *obj,
45 void *_pd EINA_UNUSED, 45 void *_pd EINA_UNUSED,
46 Efl_Text_Style_Backing_Type type) 46 Efl_Text_Style_Background_Type type)
47{ 47{
48 Edje_User_Defined *eud; 48 Edje_User_Defined *eud;
49 49
@@ -53,19 +53,19 @@ _efl_canvas_layout_part_text_efl_text_style_backing_type_set(Eo *obj,
53 eud = _edje_user_text_style_definition_fetch(pd->ed, pd->part); 53 eud = _edje_user_text_style_definition_fetch(pd->ed, pd->part);
54 54
55 eud->u.text_style.types |= EDJE_PART_TEXT_PROP_NONE; 55 eud->u.text_style.types |= EDJE_PART_TEXT_PROP_NONE;
56 efl_text_backing_type_set(pd->rp->object, type); 56 efl_text_background_type_set(pd->rp->object, type);
57} 57}
58 58
59EOLIAN static Efl_Text_Style_Backing_Type 59EOLIAN static Efl_Text_Style_Background_Type
60_efl_canvas_layout_part_text_efl_text_style_backing_type_get(const Eo *obj, 60_efl_canvas_layout_part_text_efl_text_style_text_background_type_get(const Eo *obj,
61 void *_pd EINA_UNUSED) 61 void *_pd EINA_UNUSED)
62{ 62{
63 63
64 PROXY_DATA_GET(obj, pd); 64 PROXY_DATA_GET(obj, pd);
65 if (pd->rp->part->type == EDJE_PART_TYPE_TEXT) 65 if (pd->rp->part->type == EDJE_PART_TYPE_TEXT)
66 return EFL_TEXT_STYLE_BACKING_TYPE_DISABLED; 66 return EFL_TEXT_STYLE_BACKGROUND_TYPE_DISABLED;
67 67
68 return efl_text_backing_type_get(pd->rp->object); 68 return efl_text_background_type_get(pd->rp->object);
69} 69}
70 70
71#define TEXT_COLOR_IMPL(x, X) \ 71#define TEXT_COLOR_IMPL(x, X) \
@@ -82,7 +82,7 @@ _efl_canvas_layout_part_text_efl_text_style_ ##x ##_color_set(Eo *obj, \
82 eud = _edje_user_text_style_definition_fetch(pd->ed, pd->part); \ 82 eud = _edje_user_text_style_definition_fetch(pd->ed, pd->part); \
83 \ 83 \
84 eud->u.text_style.types |= EDJE_PART_TEXT_PROP_COLOR_ ##X; \ 84 eud->u.text_style.types |= EDJE_PART_TEXT_PROP_COLOR_ ##X; \
85 efl_text_ ##x ##_color_set(pd->rp->object, r, g, b, a); \ 85 efl_ ##x ##_color_set(pd->rp->object, r, g, b, a); \
86} \ 86} \
87\ 87\
88EOLIAN static void \ 88EOLIAN static void \
@@ -93,22 +93,22 @@ _efl_canvas_layout_part_text_efl_text_style_ ##x ##_color_get(const Eo *obj, \
93 PROXY_DATA_GET(obj, pd); \ 93 PROXY_DATA_GET(obj, pd); \
94 *r = *g = *b = *a = 0; \ 94 *r = *g = *b = *a = 0; \
95 if (pd->rp->part->type == EDJE_PART_TYPE_TEXT) return; \ 95 if (pd->rp->part->type == EDJE_PART_TYPE_TEXT) return; \
96 efl_text_ ##x ##_color_get(pd->rp->object, r, g, b, a); \ 96 efl_ ##x ##_color_get(pd->rp->object, r, g, b, a); \
97} 97}
98 98
99TEXT_COLOR_IMPL(backing, BACKING) 99TEXT_COLOR_IMPL(text_background, BACKING)
100TEXT_COLOR_IMPL(glow, GLOW) 100TEXT_COLOR_IMPL(text_glow, GLOW)
101TEXT_COLOR_IMPL(glow2, GLOW2) 101TEXT_COLOR_IMPL(text_glow2, GLOW2)
102TEXT_COLOR_IMPL(normal, NORMAL) 102TEXT_COLOR_IMPL(text, NORMAL)
103TEXT_COLOR_IMPL(outline, OUTLINE) 103TEXT_COLOR_IMPL(text_outline, OUTLINE)
104TEXT_COLOR_IMPL(shadow, SHADOW) 104TEXT_COLOR_IMPL(text_shadow, SHADOW)
105TEXT_COLOR_IMPL(strikethrough, STRIKETHROUGH) 105TEXT_COLOR_IMPL(text_strikethrough, STRIKETHROUGH)
106TEXT_COLOR_IMPL(underline, UNDERLINE) 106TEXT_COLOR_IMPL(text_underline, UNDERLINE)
107TEXT_COLOR_IMPL(underline2, UNDERLINE2) 107TEXT_COLOR_IMPL(text_underline2, UNDERLINE2)
108TEXT_COLOR_IMPL(underline_dashed, UNDERLINE_DASHED) 108TEXT_COLOR_IMPL(text_underline_dashed, UNDERLINE_DASHED)
109 109
110EOLIAN static void 110EOLIAN static void
111_efl_canvas_layout_part_text_efl_text_style_effect_type_set(Eo *obj, 111_efl_canvas_layout_part_text_efl_text_style_text_effect_type_set(Eo *obj,
112 void *_pd EINA_UNUSED, 112 void *_pd EINA_UNUSED,
113 Efl_Text_Style_Effect_Type type) 113 Efl_Text_Style_Effect_Type type)
114{ 114{
@@ -201,7 +201,7 @@ _efl_canvas_layout_part_text_efl_text_font_font_size_get(const Eo *obj,
201} 201}
202 202
203EOLIAN static void 203EOLIAN static void
204_efl_canvas_layout_part_text_efl_text_style_shadow_direction_set(Eo *obj, 204_efl_canvas_layout_part_text_efl_text_style_text_shadow_direction_set(Eo *obj,
205 void *_pd EINA_UNUSED, 205 void *_pd EINA_UNUSED,
206 Efl_Text_Style_Shadow_Direction type) 206 Efl_Text_Style_Shadow_Direction type)
207{ 207{
@@ -217,7 +217,7 @@ _efl_canvas_layout_part_text_efl_text_style_shadow_direction_set(Eo *obj,
217} 217}
218 218
219EOLIAN static void 219EOLIAN static void
220_efl_canvas_layout_part_text_efl_text_style_strikethrough_type_set(Eo *obj, 220_efl_canvas_layout_part_text_efl_text_style_text_strikethrough_type_set(Eo *obj,
221 void *_pd EINA_UNUSED, 221 void *_pd EINA_UNUSED,
222 Efl_Text_Style_Strikethrough_Type type) 222 Efl_Text_Style_Strikethrough_Type type)
223{ 223{
@@ -233,7 +233,7 @@ _efl_canvas_layout_part_text_efl_text_style_strikethrough_type_set(Eo *obj,
233} 233}
234 234
235EOLIAN static void 235EOLIAN static void
236_efl_canvas_layout_part_text_efl_text_style_underline_type_set(Eo *obj, 236_efl_canvas_layout_part_text_efl_text_style_text_underline_type_set(Eo *obj,
237 void *_pd EINA_UNUSED, 237 void *_pd EINA_UNUSED,
238 Efl_Text_Style_Underline_Type type) 238 Efl_Text_Style_Underline_Type type)
239{ 239{
@@ -250,7 +250,7 @@ _efl_canvas_layout_part_text_efl_text_style_underline_type_set(Eo *obj,
250} 250}
251 251
252EOLIAN static void 252EOLIAN static void
253_efl_canvas_layout_part_text_efl_text_style_underline_height_set(Eo *obj, 253_efl_canvas_layout_part_text_efl_text_style_text_underline_height_set(Eo *obj,
254 void *_pd EINA_UNUSED, 254 void *_pd EINA_UNUSED,
255 double value) 255 double value)
256{ 256{
@@ -266,7 +266,7 @@ _efl_canvas_layout_part_text_efl_text_style_underline_height_set(Eo *obj,
266} 266}
267 267
268EOLIAN static void 268EOLIAN static void
269_efl_canvas_layout_part_text_efl_text_style_underline_dashed_width_set(Eo *obj, 269_efl_canvas_layout_part_text_efl_text_style_text_underline_dashed_width_set(Eo *obj,
270 void *_pd EINA_UNUSED, 270 void *_pd EINA_UNUSED,
271 int value) 271 int value)
272{ 272{
@@ -282,7 +282,7 @@ _efl_canvas_layout_part_text_efl_text_style_underline_dashed_width_set(Eo *obj,
282} 282}
283 283
284EOLIAN static void 284EOLIAN static void
285_efl_canvas_layout_part_text_efl_text_style_underline_dashed_gap_set(Eo *obj, 285_efl_canvas_layout_part_text_efl_text_style_text_underline_dashed_gap_set(Eo *obj,
286 void *_pd EINA_UNUSED, 286 void *_pd EINA_UNUSED,
287 int value) 287 int value)
288{ 288{
@@ -353,28 +353,28 @@ _canvas_layout_user_text_collect(Edje *ed, Edje_User_Defined *eud)
353 Edje_Part_Text_Prop *prop; 353 Edje_Part_Text_Prop *prop;
354 354
355 prop = _prop_new(props, EDJE_PART_TEXT_PROP_BACKING_TYPE); 355 prop = _prop_new(props, EDJE_PART_TEXT_PROP_BACKING_TYPE);
356 prop->val.backing = efl_text_backing_type_get(rp->object); 356 prop->val.backing = efl_text_background_type_get(rp->object);
357 } 357 }
358#define STYLE_COLOR_COLLECT(x, X) \ 358#define STYLE_COLOR_COLLECT(x, X) \
359 if (eud->u.text_style.types & EDJE_PART_TEXT_PROP_COLOR_ ##X) \ 359 if (eud->u.text_style.types & EDJE_PART_TEXT_PROP_COLOR_ ##X) \
360 { \ 360 { \
361 Edje_Part_Text_Prop *prop; \ 361 Edje_Part_Text_Prop *prop; \
362 prop = _prop_new(props, EDJE_PART_TEXT_PROP_COLOR_ ##X); \ 362 prop = _prop_new(props, EDJE_PART_TEXT_PROP_COLOR_ ##X); \
363 efl_text_ ##x ##_color_get(rp->object, \ 363 efl_ ##x ##_color_get(rp->object, \
364 &prop->val.color.r, &prop->val.color.g, \ 364 &prop->val.color.r, &prop->val.color.g, \
365 &prop->val.color.b, &prop->val.color.a); \ 365 &prop->val.color.b, &prop->val.color.a); \
366 } \ 366 } \
367 367
368 STYLE_COLOR_COLLECT(backing, BACKING) 368 STYLE_COLOR_COLLECT(text_background, BACKING)
369 STYLE_COLOR_COLLECT(glow, GLOW) 369 STYLE_COLOR_COLLECT(text_glow, GLOW)
370 STYLE_COLOR_COLLECT(glow2, GLOW2) 370 STYLE_COLOR_COLLECT(text_glow2, GLOW2)
371 STYLE_COLOR_COLLECT(normal, NORMAL) 371 STYLE_COLOR_COLLECT(text, NORMAL)
372 STYLE_COLOR_COLLECT(outline, OUTLINE) 372 STYLE_COLOR_COLLECT(text_outline, OUTLINE)
373 STYLE_COLOR_COLLECT(shadow, SHADOW) 373 STYLE_COLOR_COLLECT(text_shadow, SHADOW)
374 STYLE_COLOR_COLLECT(strikethrough, STRIKETHROUGH) 374 STYLE_COLOR_COLLECT(text_strikethrough, STRIKETHROUGH)
375 STYLE_COLOR_COLLECT(underline, UNDERLINE) 375 STYLE_COLOR_COLLECT(text_underline, UNDERLINE)
376 STYLE_COLOR_COLLECT(underline2, UNDERLINE2) 376 STYLE_COLOR_COLLECT(text_underline2, UNDERLINE2)
377 STYLE_COLOR_COLLECT(underline_dashed, UNDERLINE_DASHED) 377 STYLE_COLOR_COLLECT(text_underline_dashed, UNDERLINE_DASHED)
378#undef STYLE_COLOR_COLLECT 378#undef STYLE_COLOR_COLLECT
379 379
380 if (eud->u.text_style.types & EDJE_PART_TEXT_PROP_EFFECT_TYPE) 380 if (eud->u.text_style.types & EDJE_PART_TEXT_PROP_EFFECT_TYPE)
@@ -468,7 +468,7 @@ _canvas_layout_user_text_apply(Edje_User_Defined *eud, Eo *obj,
468 { 468 {
469 469
470 case EDJE_PART_TEXT_PROP_BACKING_TYPE: 470 case EDJE_PART_TEXT_PROP_BACKING_TYPE:
471 efl_text_backing_type_set( 471 efl_text_background_type_set(
472 efl_part(obj, 472 efl_part(obj,
473 eud->part), 473 eud->part),
474 prop->val.backing); 474 prop->val.backing);
@@ -476,7 +476,7 @@ _canvas_layout_user_text_apply(Edje_User_Defined *eud, Eo *obj,
476 476
477#define STYLE_COLOR_CASE(x, X) \ 477#define STYLE_COLOR_CASE(x, X) \
478 case EDJE_PART_TEXT_PROP_COLOR_##X : \ 478 case EDJE_PART_TEXT_PROP_COLOR_##X : \
479 efl_text_##x ##_color_set(efl_part(obj, \ 479 efl_##x ##_color_set(efl_part(obj, \
480 eud->part), \ 480 eud->part), \
481 prop->val.color.r, \ 481 prop->val.color.r, \
482 prop->val.color.g, \ 482 prop->val.color.g, \
@@ -484,16 +484,16 @@ _canvas_layout_user_text_apply(Edje_User_Defined *eud, Eo *obj,
484 prop->val.color.a); \ 484 prop->val.color.a); \
485 break; 485 break;
486 486
487 STYLE_COLOR_CASE(backing, BACKING) 487 STYLE_COLOR_CASE(text_background, BACKING)
488 STYLE_COLOR_CASE(glow, GLOW) 488 STYLE_COLOR_CASE(text_glow, GLOW)
489 STYLE_COLOR_CASE(glow2, GLOW2) 489 STYLE_COLOR_CASE(text_glow2, GLOW2)
490 STYLE_COLOR_CASE(normal, NORMAL) 490 STYLE_COLOR_CASE(text, NORMAL)
491 STYLE_COLOR_CASE(outline, OUTLINE) 491 STYLE_COLOR_CASE(text_outline, OUTLINE)
492 STYLE_COLOR_CASE(shadow, SHADOW) 492 STYLE_COLOR_CASE(text_shadow, SHADOW)
493 STYLE_COLOR_CASE(strikethrough, STRIKETHROUGH) 493 STYLE_COLOR_CASE(text_strikethrough, STRIKETHROUGH)
494 STYLE_COLOR_CASE(underline, UNDERLINE) 494 STYLE_COLOR_CASE(text_underline, UNDERLINE)
495 STYLE_COLOR_CASE(underline2, UNDERLINE2) 495 STYLE_COLOR_CASE(text_underline2, UNDERLINE2)
496 STYLE_COLOR_CASE(underline_dashed, UNDERLINE_DASHED) 496 STYLE_COLOR_CASE(text_underline_dashed, UNDERLINE_DASHED)
497#undef STYLE_COLOR_CASE 497#undef STYLE_COLOR_CASE
498 498
499 case EDJE_PART_TEXT_PROP_EFFECT_TYPE: 499 case EDJE_PART_TEXT_PROP_EFFECT_TYPE:
diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h
index c572d74991..9a293e2e33 100644
--- a/src/lib/edje/edje_private.h
+++ b/src/lib/edje/edje_private.h
@@ -2316,7 +2316,7 @@ typedef struct
2316 int ni; // number integer 2316 int ni; // number integer
2317 int nd; // number double 2317 int nd; // number double
2318 Efl_Text_Format_Wrap wrap; 2318 Efl_Text_Format_Wrap wrap;
2319 Efl_Text_Style_Backing_Type backing; 2319 Efl_Text_Style_Background_Type backing;
2320 Efl_Text_Style_Underline_Type underline; 2320 Efl_Text_Style_Underline_Type underline;
2321 struct 2321 struct
2322 { 2322 {
diff --git a/src/lib/edje/efl_canvas_layout_part_text.eo b/src/lib/edje/efl_canvas_layout_part_text.eo
index cacf430a57..ed3cc4ec04 100644
--- a/src/lib/edje/efl_canvas_layout_part_text.eo
+++ b/src/lib/edje/efl_canvas_layout_part_text.eo
@@ -40,23 +40,23 @@ Efl.Text_Markup, Efl.Text_Format, Efl.Text_Font, Efl.Text_Style
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.font_family { set; get; }
42 Efl.Text_Font.font_size { set; get; } 42 Efl.Text_Font.font_size { set; get; }
43 Efl.Text_Style.normal_color { set; get; } 43 Efl.Text_Style.text_color { set; get; }
44 Efl.Text_Style.backing_type { set; get; } 44 Efl.Text_Style.text_background_type { set; get; }
45 Efl.Text_Style.backing_color { set; get;} 45 Efl.Text_Style.text_background_color { set; get;}
46 Efl.Text_Style.underline_type { set; } 46 Efl.Text_Style.text_underline_type { set; }
47 Efl.Text_Style.underline_color { set; get; } 47 Efl.Text_Style.text_underline_color { set; get; }
48 Efl.Text_Style.underline2_color { set; get; } 48 Efl.Text_Style.text_underline2_color { set; get; }
49 Efl.Text_Style.underline_dashed_color { set; get; } 49 Efl.Text_Style.text_underline_dashed_color { set; get; }
50 Efl.Text_Style.underline_height { set; } 50 Efl.Text_Style.text_underline_height { set; }
51 Efl.Text_Style.underline_dashed_width { set; } 51 Efl.Text_Style.text_underline_dashed_width { set; }
52 Efl.Text_Style.underline_dashed_gap { set; } 52 Efl.Text_Style.text_underline_dashed_gap { set; }
53 Efl.Text_Style.strikethrough_type { set; } 53 Efl.Text_Style.text_strikethrough_type { set; }
54 Efl.Text_Style.strikethrough_color { set; get; } 54 Efl.Text_Style.text_strikethrough_color { set; get; }
55 Efl.Text_Style.effect_type { set; } 55 Efl.Text_Style.text_effect_type { set; }
56 Efl.Text_Style.shadow_direction { set; } 56 Efl.Text_Style.text_shadow_direction { set; }
57 Efl.Text_Style.outline_color { set; get; } 57 Efl.Text_Style.text_outline_color { set; get; }
58 Efl.Text_Style.shadow_color { set; get; } 58 Efl.Text_Style.text_shadow_color { set; get; }
59 Efl.Text_Style.glow_color { set; get; } 59 Efl.Text_Style.text_glow_color { set; get; }
60 Efl.Text_Style.glow2_color { set; get; } 60 Efl.Text_Style.text_glow2_color { set; get; }
61 } 61 }
62} 62}
diff --git a/src/lib/efl/interfaces/efl_text_style.eo b/src/lib/efl/interfaces/efl_text_style.eo
index 9b66595558..17c209e01d 100644
--- a/src/lib/efl/interfaces/efl_text_style.eo
+++ b/src/lib/efl/interfaces/efl_text_style.eo
@@ -1,8 +1,9 @@
1enum @beta Efl.Text_Style_Backing_Type 1enum @beta Efl.Text_Style_Background_Type
2{ 2{
3 [[Whether to add a background colored rectangle (backing) to each line of text or not.]] 3 [[Whether to add a background colored rectangle (background) to each line of text or not.]]
4 disabled = 0, [[Do not use backing.]] 4 disabled = 0, [[Do not use background.]]
5 enabled, [[Use backing.]] 5 enabled, [[Use background.]]
6
6} 7}
7 8
8enum @beta Efl.Text_Style_Strikethrough_Type 9enum @beta Efl.Text_Style_Strikethrough_Type
@@ -10,6 +11,7 @@ enum @beta Efl.Text_Style_Strikethrough_Type
10 [[Whether to add a strike-through decoration to the displayed text or not.]] 11 [[Whether to add a strike-through decoration to the displayed text or not.]]
11 disabled = 0, [[Do not use strike-through.]] 12 disabled = 0, [[Do not use strike-through.]]
12 enabled, [[Use strike-through.]] 13 enabled, [[Use strike-through.]]
14
13} 15}
14 16
15enum @beta Efl.Text_Style_Effect_Type 17enum @beta Efl.Text_Style_Effect_Type
@@ -62,7 +64,7 @@ interface @beta Efl.Text_Style {
62 ]] 64 ]]
63 c_prefix: efl_text; 65 c_prefix: efl_text;
64 methods { 66 methods {
65 @property normal_color { 67 @property text_color {
66 [[Color of text, excluding decorations like, shadow, outline or glow.]] 68 [[Color of text, excluding decorations like, shadow, outline or glow.]]
67 values 69 values
68 { 70 {
@@ -73,15 +75,15 @@ interface @beta Efl.Text_Style {
73 } 75 }
74 } 76 }
75 77
76 @property backing_type { 78 @property text_background_type {
77 [[Enables rendering of a background rectangle behind each line of text.]] 79 [[Enables rendering of a background rectangle behind each line of text.]]
78 values 80 values
79 { 81 {
80 type: Efl.Text_Style_Backing_Type; [[Backing type.]] 82 type: Efl.Text_Style_Background_Type; [[Background type.]]
81 } 83 }
82 } 84 }
83 85
84 @property backing_color { 86 @property text_background_color {
85 [[Color of the background rectangle (backing) behind each line of text.]] 87 [[Color of the background rectangle (backing) behind each line of text.]]
86 values 88 values
87 { 89 {
@@ -92,7 +94,7 @@ interface @beta Efl.Text_Style {
92 } 94 }
93 } 95 }
94 96
95 @property underline_type { 97 @property text_underline_type {
96 [[Underline style for the text.]] 98 [[Underline style for the text.]]
97 values 99 values
98 { 100 {
@@ -100,7 +102,7 @@ interface @beta Efl.Text_Style {
100 } 102 }
101 } 103 }
102 104
103 @property underline_color 105 @property text_underline_color
104 { 106 {
105 [[Color of normal underline style.]] 107 [[Color of normal underline style.]]
106 values 108 values
@@ -112,9 +114,9 @@ interface @beta Efl.Text_Style {
112 } 114 }
113 } 115 }
114 116
115 @property underline_height 117 @property text_underline_height
116 { 118 {
117 [[Width (in pixels) of the single underline when @.underline_type is 119 [[Width (in pixels) of the single underline when @.text_underline_type is
118 @Efl.Text_Style_Underline_Type.single.]] 120 @Efl.Text_Style_Underline_Type.single.]]
119 values 121 values
120 { 122 {
@@ -122,9 +124,9 @@ interface @beta Efl.Text_Style {
122 } 124 }
123 } 125 }
124 126
125 @property underline_dashed_color 127 @property text_underline_dashed_color
126 { 128 {
127 [[Color of the dashed underline. Only valid when @.underline_type is 129 [[Color of the dashed underline. Only valid when @.text_underline_type is
128 @Efl.Text_Style_Underline_Type.dashed.]] 130 @Efl.Text_Style_Underline_Type.dashed.]]
129 values 131 values
130 { 132 {
@@ -135,9 +137,9 @@ interface @beta Efl.Text_Style {
135 } 137 }
136 } 138 }
137 139
138 @property underline_dashed_width 140 @property text_underline_dashed_width
139 { 141 {
140 [[Length (in pixels) of the dashes when @.underline_type is 142 [[Length (in pixels) of the dashes when @.text_underline_type is
141 @Efl.Text_Style_Underline_Type.dashed.]] 143 @Efl.Text_Style_Underline_Type.dashed.]]
142 values 144 values
143 { 145 {
@@ -145,9 +147,9 @@ interface @beta Efl.Text_Style {
145 } 147 }
146 } 148 }
147 149
148 @property underline_dashed_gap 150 @property text_underline_dashed_gap
149 { 151 {
150 [[Length (in pixels) of the gaps between the dashes when @.underline_type is 152 [[Length (in pixels) of the gaps between the dashes when @.text_underline_type is
151 @Efl.Text_Style_Underline_Type.dashed.]] 153 @Efl.Text_Style_Underline_Type.dashed.]]
152 values 154 values
153 { 155 {
@@ -155,9 +157,9 @@ interface @beta Efl.Text_Style {
155 } 157 }
156 } 158 }
157 159
158 @property underline2_color 160 @property text_underline2_color
159 { 161 {
160 [[Color of the secondary underline. Only valid when @.underline_type is 162 [[Color of the secondary underline. Only valid when @.text_underline_type is
161 @Efl.Text_Style_Underline_Type.double.]] 163 @Efl.Text_Style_Underline_Type.double.]]
162 values 164 values
163 { 165 {
@@ -168,7 +170,7 @@ interface @beta Efl.Text_Style {
168 } 170 }
169 } 171 }
170 172
171 @property strikethrough_type { 173 @property text_strikethrough_type {
172 [[Enables crossed-out text.]] 174 [[Enables crossed-out text.]]
173 values 175 values
174 { 176 {
@@ -176,7 +178,7 @@ interface @beta Efl.Text_Style {
176 } 178 }
177 } 179 }
178 180
179 @property strikethrough_color 181 @property text_strikethrough_color
180 { 182 {
181 [[Color of the line striking through the text.]] 183 [[Color of the line striking through the text.]]
182 values 184 values
@@ -188,14 +190,14 @@ interface @beta Efl.Text_Style {
188 } 190 }
189 } 191 }
190 192
191 @property effect_type { 193 @property text_effect_type {
192 [[Controls a number of decorations around the text, like shadow, outline 194 [[Controls a number of decorations around the text, like shadow, outline
193 and glow, including combinations of them.]] 195 and glow, including combinations of them.]]
194 values { 196 values {
195 type: Efl.Text_Style_Effect_Type; [[Effect type.]] 197 type: Efl.Text_Style_Effect_Type; [[Effect type.]]
196 } 198 }
197 } 199 }
198 @property outline_color 200 @property text_outline_color
199 { 201 {
200 [[Color of the text outline.]] 202 [[Color of the text outline.]]
201 values 203 values
@@ -207,7 +209,7 @@ interface @beta Efl.Text_Style {
207 } 209 }
208 } 210 }
209 211
210 @property shadow_direction 212 @property text_shadow_direction
211 { 213 {
212 [[Direction of shadow effect.]] 214 [[Direction of shadow effect.]]
213 values 215 values
@@ -216,7 +218,7 @@ interface @beta Efl.Text_Style {
216 } 218 }
217 } 219 }
218 220
219 @property shadow_color 221 @property text_shadow_color
220 { 222 {
221 [[Color of the shadow.]] 223 [[Color of the shadow.]]
222 values 224 values
@@ -228,7 +230,7 @@ interface @beta Efl.Text_Style {
228 } 230 }
229 } 231 }
230 232
231 @property glow_color 233 @property text_glow_color
232 { 234 {
233 [[Color of the glow decoration.]] 235 [[Color of the glow decoration.]]
234 values 236 values
@@ -240,11 +242,11 @@ interface @beta Efl.Text_Style {
240 } 242 }
241 } 243 }
242 244
243 @property glow2_color 245 @property text_glow2_color
244 { 246 {
245 [[Color of the secondary glow decoration. 247 [[Color of the secondary glow decoration.
246 This is the color of the inner glow (where it touches the text) which 248 This is the color of the inner glow (where it touches the text) which
247 gradually fades into @.glow_color as it reaches the edge. 249 gradually fades into @.text_glow_color as it reaches the edge.
248 ]] 250 ]]
249 values 251 values
250 { 252 {
@@ -255,7 +257,7 @@ interface @beta Efl.Text_Style {
255 } 257 }
256 } 258 }
257 259
258 @property gfx_filter 260 @property text_gfx_filter
259 { 261 {
260 [[Program that applies a special filter 262 [[Program that applies a special filter
261 263
diff --git a/src/lib/elementary/efl_ui_textbox.c b/src/lib/elementary/efl_ui_textbox.c
index 456f9f8889..26e09f0f72 100644
--- a/src/lib/elementary/efl_ui_textbox.c
+++ b/src/lib/elementary/efl_ui_textbox.c
@@ -1925,7 +1925,7 @@ _update_text_theme(Eo *obj, Efl_Ui_Textbox_Data *sd)
1925 colorcode = edje_object_data_get(wd->resize_obj, "style.color"); 1925 colorcode = edje_object_data_get(wd->resize_obj, "style.color");
1926 if (colorcode && _format_color_parse(colorcode, strlen(colorcode), &r, &g, &b, &a)) 1926 if (colorcode && _format_color_parse(colorcode, strlen(colorcode), &r, &g, &b, &a))
1927 { 1927 {
1928 efl_text_normal_color_set(sd->text_obj, r, g, b, a); 1928 efl_text_color_set(sd->text_obj, r, g, b, a);
1929 } 1929 }
1930 1930
1931 // Guide Text 1931 // Guide Text
@@ -1943,7 +1943,7 @@ _update_text_theme(Eo *obj, Efl_Ui_Textbox_Data *sd)
1943 colorcode = edje_object_data_get(wd->resize_obj, "guide.style.color"); 1943 colorcode = edje_object_data_get(wd->resize_obj, "guide.style.color");
1944 if (colorcode && _format_color_parse(colorcode, strlen(colorcode), &r, &g, &b, &a)) 1944 if (colorcode && _format_color_parse(colorcode, strlen(colorcode), &r, &g, &b, &a))
1945 { 1945 {
1946 efl_text_normal_color_set(sd->text_guide_obj, r, g, b, a); 1946 efl_text_color_set(sd->text_guide_obj, r, g, b, a);
1947 } 1947 }
1948} 1948}
1949 1949
diff --git a/src/lib/evas/canvas/efl_canvas_textblock.eo b/src/lib/evas/canvas/efl_canvas_textblock.eo
index d183574817..978c502b2c 100644
--- a/src/lib/evas/canvas/efl_canvas_textblock.eo
+++ b/src/lib/evas/canvas/efl_canvas_textblock.eo
@@ -10,7 +10,7 @@ class @beta Efl.Canvas.Textblock extends Efl.Canvas.Object implements Efl.Text,
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.font_family, @Efl.Text_Font.font_size and
13 @Efl.Text_Style.normal_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 ]]
16 methods { 16 methods {
@@ -139,53 +139,53 @@ class @beta Efl.Canvas.Textblock extends Efl.Canvas.Object implements Efl.Text,
139 - $color: Color code for the text (See bottom for the complete list of supported codes). 139 - $color: Color code for the text (See bottom for the complete list of supported codes).
140 Default value is $[rgba(0,0,0,0)] meaning that no text will be rendered. 140 Default value is $[rgba(0,0,0,0)] meaning that no text will be rendered.
141 Requires $font and $font_size. 141 Requires $font and $font_size.
142 See @Efl.Text_Style.normal_color. 142 See @Efl.Text_Style.text_color.
143 143
144 - $underline_color: Color code for the text underline (See bottom for the complete list of supported codes). 144 - $underline_color: Color code for the text underline (See bottom for the complete list of supported codes).
145 Default value is $[rgba(0,0,0,0)] meaning that no underline will be rendered. 145 Default value is $[rgba(0,0,0,0)] meaning that no underline will be rendered.
146 Requires $underline. 146 Requires $underline.
147 See @Efl.Text_Style.underline_color. 147 See @Efl.Text_Style.text_underline_color.
148 148
149 - $underline2_color: Color code for the secondary text underline (See bottom for the complete list of 149 - $underline2_color: Color code for the secondary text underline (See bottom for the complete list of
150 supported codes). Only valid when $[underline=double]. 150 supported codes). Only valid when $[underline=double].
151 Default value is $[rgba(0,0,0,0)] meaning that secondary underline will not be rendered. 151 Default value is $[rgba(0,0,0,0)] meaning that secondary underline will not be rendered.
152 See @Efl.Text_Style.underline2_color. 152 See @Efl.Text_Style.text_underline2_color.
153 153
154 - $underline_dash_color: Color code for the dashed underline (See bottom for the complete list of supported 154 - $underline_dash_color: Color code for the dashed underline (See bottom for the complete list of supported
155 codes). Only valid when $[underline=dashed]. 155 codes). Only valid when $[underline=dashed].
156 Default value is $[rgba(0,0,0,0)] meaning that dashed underline will not be rendered. 156 Default value is $[rgba(0,0,0,0)] meaning that dashed underline will not be rendered.
157 See @Efl.Text_Style.underline_dashed_color. 157 See @Efl.Text_Style.text_underline_dashed_color.
158 158
159 - $outline_color: Color code for the text outline (See bottom for the complete list of supported codes). 159 - $outline_color: Color code for the text outline (See bottom for the complete list of supported codes).
160 Only valid when the $style attribute includes an outline. 160 Only valid when the $style attribute includes an outline.
161 Default value is $[rgba(0,0,0,0)] meaning that no outline will be rendered. 161 Default value is $[rgba(0,0,0,0)] meaning that no outline will be rendered.
162 See @Efl.Text_Style.outline_color. 162 See @Efl.Text_Style.text_outline_color.
163 163
164 - $shadow_color: Color code for the text shadow (See bottom for the complete list of supported codes). 164 - $shadow_color: Color code for the text shadow (See bottom for the complete list of supported codes).
165 Only valid when the $style attribute includes a shadow. 165 Only valid when the $style attribute includes a shadow.
166 Default value is $[rgba(0,0,0,0)] meaning that no shadow will be rendered. 166 Default value is $[rgba(0,0,0,0)] meaning that no shadow will be rendered.
167 See @Efl.Text_Style.shadow_color. 167 See @Efl.Text_Style.text_shadow_color.
168 168
169 - $glow_color: Color code for the glow component of the text (See bottom for the complete list of supported 169 - $glow_color: Color code for the glow component of the text (See bottom for the complete list of supported
170 codes). Only valid when the $style attribute includes a glow. 170 codes). Only valid when the $style attribute includes a glow.
171 Default value is $[rgba(0,0,0,0)] meaning that no glow will be rendered. 171 Default value is $[rgba(0,0,0,0)] meaning that no glow will be rendered.
172 See @Efl.Text_Style.glow_color. 172 See @Efl.Text_Style.text_glow_color.
173 173
174 - $glow2_color: Color code for the secondary (inner) glow component of the text (See bottom for the complete 174 - $glow2_color: Color code for the secondary (inner) glow component of the text (See bottom for the complete
175 list of supported codes). Only valid when the $style attribute includes a glow. 175 list of supported codes). Only valid when the $style attribute includes a glow.
176 Default value is $[rgba(0,0,0,0)] meaning that only the primary $glow_color will be used. 176 Default value is $[rgba(0,0,0,0)] meaning that only the primary $glow_color will be used.
177 See @Efl.Text_Style.glow2_color. 177 See @Efl.Text_Style.text_glow2_color.
178 178
179 - $backing_color: Color code for the background of the text (See bottom for the complete list of supported 179 - $backing_color: Color code for the background of the text (See bottom for the complete list of supported
180 codes). Use a fully transparent color to disable the background. 180 codes). Use a fully transparent color to disable the background.
181 Default value is $[rgba(0,0,0,0)] meaning that no backing will be rendered. 181 Default value is $[rgba(0,0,0,0)] meaning that no backing will be rendered.
182 Requires $backing. 182 Requires $backing.
183 See @Efl.Text_Style.backing_color. 183 See @Efl.Text_Style.text_background_color.
184 184
185 - $strikethrough_color: Color code for the line striking through the text (See bottom for the complete list 185 - $strikethrough_color: Color code for the line striking through the text (See bottom for the complete list
186 of supported codes). Only valid when $[strikethrough=on] 186 of supported codes). Only valid when $[strikethrough=on]
187 Default value is $[rgba(0,0,0,0)] meaning that no strike-through line will be rendered. 187 Default value is $[rgba(0,0,0,0)] meaning that no strike-through line will be rendered.
188 See @Efl.Text_Style.strikethrough_color. 188 See @Efl.Text_Style.text_strikethrough_color.
189 189
190 - $align: Horizontal alignment of the text. The value can either be a decimal number ($[0.0] means "left" 190 - $align: Horizontal alignment of the text. The value can either be a decimal number ($[0.0] means "left"
191 and $[1.0] means "right"), a percentage ($[0%] means "left" and $[100%] means "right") or one of: 191 and $[1.0] means "right"), a percentage ($[0%] means "left" and $[100%] means "right") or one of:
@@ -230,17 +230,17 @@ class @beta Efl.Canvas.Textblock extends Efl.Canvas.Object implements Efl.Text,
230 $dashed (A dashed line under the text). 230 $dashed (A dashed line under the text).
231 Default value is $off. 231 Default value is $off.
232 Requires either $underline_color, $underline2_color or $underline_dash_color. 232 Requires either $underline_color, $underline2_color or $underline_dash_color.
233 See @Efl.Text_Style.underline_type. 233 See @Efl.Text_Style.text_underline_type.
234 234
235 - $strikethrough: Enables crossed-out text. Possible values are $on and $off. 235 - $strikethrough: Enables crossed-out text. Possible values are $on and $off.
236 Default value is $off. 236 Default value is $off.
237 Requires $strikethrough_color. 237 Requires $strikethrough_color.
238 See @Efl.Text_Style.strikethrough_type. 238 See @Efl.Text_Style.text_strikethrough_type.
239 239
240 - $backing: Enables background color for the text. Possible values are $on and $off. 240 - $backing: Enables background color for the text. Possible values are $on and $off.
241 Default value is $off. 241 Default value is $off.
242 Requires $backing_color. 242 Requires $backing_color.
243 See @Efl.Text_Style.backing_type. 243 See @Efl.Text_Style.text_background_type.
244 244
245 - $style: Controls a number of decorations around the text, like shadow, outline and glow, including 245 - $style: Controls a number of decorations around the text, like shadow, outline and glow, including
246 combinations of them. Possible values are $plain (No decoration, alias for $off and $none), 246 combinations of them. Possible values are $plain (No decoration, alias for $off and $none),
@@ -252,7 +252,7 @@ class @beta Efl.Canvas.Textblock extends Efl.Canvas.Object implements Efl.Text,
252 Default value is $plain. 252 Default value is $plain.
253 Requires either $shadow_color, $glow_color or $outline_color. 253 Requires either $shadow_color, $glow_color or $outline_color.
254 Examples: $[style=outline], $[style=shadow,bottom_right], $[style=outline_shadow,bottom]. 254 Examples: $[style=outline], $[style=shadow,bottom_right], $[style=outline_shadow,bottom].
255 See @Efl.Text_Style.effect_type and @Efl.Text_Style.shadow_direction. 255 See @Efl.Text_Style.text_effect_type and @Efl.Text_Style.text_shadow_direction.
256 256
257 - $tabstops: Size (in pixels) of the tab character. The value must be a number greater than one. 257 - $tabstops: Size (in pixels) of the tab character. The value must be a number greater than one.
258 Default value is $[32]. 258 Default value is $[32].
@@ -311,15 +311,15 @@ class @beta Efl.Canvas.Textblock extends Efl.Canvas.Object implements Efl.Text,
311 311
312 - $underline_dash_width: Length (in pixels) of the dashes when $underline is $dashed. 312 - $underline_dash_width: Length (in pixels) of the dashes when $underline is $dashed.
313 Default value is $[6]. 313 Default value is $[6].
314 See @Efl.Text_Style.underline_dashed_width. 314 See @Efl.Text_Style.text_underline_dashed_width.
315 315
316 - $underline_dash_gap: Length (in pixels) of the gaps between the dashes when $underline is $dashed. 316 - $underline_dash_gap: Length (in pixels) of the gaps between the dashes when $underline is $dashed.
317 Default value is $[2]. 317 Default value is $[2].
318 See @Efl.Text_Style.underline_dashed_gap. 318 See @Efl.Text_Style.text_underline_dashed_gap.
319 319
320 - $underline_height: Width (in pixels) of the single underline when $underline is $single. 320 - $underline_height: Width (in pixels) of the single underline when $underline is $single.
321 Default value is $[1]. 321 Default value is $[1].
322 See @Efl.Text_Style.underline_height. 322 See @Efl.Text_Style.text_underline_height.
323 323
324 - $gfx_filter: Experimental filter name. See @Efl.Gfx.Filter for more information. 324 - $gfx_filter: Experimental filter name. See @Efl.Gfx.Filter for more information.
325 325
@@ -457,25 +457,25 @@ class @beta Efl.Canvas.Textblock extends Efl.Canvas.Object implements Efl.Text,
457 Efl.Text_Font.font_slant { get; set; } 457 Efl.Text_Font.font_slant { get; set; }
458 Efl.Text_Font.font_width { get; set; } 458 Efl.Text_Font.font_width { get; set; }
459 Efl.Text_Font.font_bitmap_scalable { get; set; } 459 Efl.Text_Font.font_bitmap_scalable { get; set; }
460 Efl.Text_Style.normal_color { get; set; } 460 Efl.Text_Style.text_color { get; set; }
461 Efl.Text_Style.backing_type { get; set; } 461 Efl.Text_Style.text_background_type { get; set; }
462 Efl.Text_Style.backing_color { get; set; } 462 Efl.Text_Style.text_background_color { get; set; }
463 Efl.Text_Style.underline_type { get; set; } 463 Efl.Text_Style.text_underline_type { get; set; }
464 Efl.Text_Style.underline_color { get; set; } 464 Efl.Text_Style.text_underline_color { get; set; }
465 Efl.Text_Style.underline_height { get; set; } 465 Efl.Text_Style.text_underline_height { get; set; }
466 Efl.Text_Style.underline_dashed_color { get; set; } 466 Efl.Text_Style.text_underline_dashed_color { get; set; }
467 Efl.Text_Style.underline_dashed_width { get; set; } 467 Efl.Text_Style.text_underline_dashed_width { get; set; }
468 Efl.Text_Style.underline_dashed_gap { get; set; } 468 Efl.Text_Style.text_underline_dashed_gap { get; set; }
469 Efl.Text_Style.underline2_color { get; set; } 469 Efl.Text_Style.text_underline2_color { get; set; }
470 Efl.Text_Style.strikethrough_type { get; set; } 470 Efl.Text_Style.text_strikethrough_type { get; set; }
471 Efl.Text_Style.strikethrough_color { get; set; } 471 Efl.Text_Style.text_strikethrough_color { get; set; }
472 Efl.Text_Style.effect_type { get; set; } 472 Efl.Text_Style.text_effect_type { get; set; }
473 Efl.Text_Style.outline_color { get; set; } 473 Efl.Text_Style.text_outline_color { get; set; }
474 Efl.Text_Style.shadow_direction { get; set; } 474 Efl.Text_Style.text_shadow_direction { get; set; }
475 Efl.Text_Style.shadow_color { get; set; } 475 Efl.Text_Style.text_shadow_color { get; set; }
476 Efl.Text_Style.glow_color { get; set; } 476 Efl.Text_Style.text_glow_color { get; set; }
477 Efl.Text_Style.glow2_color { get; set; } 477 Efl.Text_Style.text_glow2_color { get; set; }
478 Efl.Text_Style.gfx_filter { get; set; } 478 Efl.Text_Style.text_gfx_filter { get; set; }
479 Efl.Text_Format.ellipsis { get; set; } 479 Efl.Text_Format.ellipsis { get; set; }
480 Efl.Text_Format.wrap { get; set; } 480 Efl.Text_Format.wrap { get; set; }
481 Efl.Text_Format.multiline { get; set; } 481 Efl.Text_Format.multiline { get; set; }
diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c
index 0c31bd8189..c15da53564 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -16345,40 +16345,40 @@ _efl_canvas_textblock_efl_text_font_font_bitmap_scalable_get(const Eo *obj EINA_
16345 if (changed) _canvas_text_format_changed(obj, o); 16345 if (changed) _canvas_text_format_changed(obj, o);
16346 16346
16347static void 16347static void
16348_efl_canvas_textblock_efl_text_style_normal_color_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char r EINA_UNUSED, unsigned char g EINA_UNUSED, unsigned char b EINA_UNUSED, unsigned char a EINA_UNUSED) 16348_efl_canvas_textblock_efl_text_style_text_color_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char r EINA_UNUSED, unsigned char g EINA_UNUSED, unsigned char b EINA_UNUSED, unsigned char a EINA_UNUSED)
16349{ 16349{
16350 ASYNC_BLOCK; 16350 ASYNC_BLOCK;
16351 _FMT_COLOR_SET(normal); 16351 _FMT_COLOR_SET(normal);
16352} 16352}
16353 16353
16354static void 16354static void
16355_efl_canvas_textblock_efl_text_style_normal_color_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char *r EINA_UNUSED, unsigned char *g EINA_UNUSED, unsigned char *b EINA_UNUSED, unsigned char *a EINA_UNUSED) 16355_efl_canvas_textblock_efl_text_style_text_color_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char *r EINA_UNUSED, unsigned char *g EINA_UNUSED, unsigned char *b EINA_UNUSED, unsigned char *a EINA_UNUSED)
16356{ 16356{
16357 _FMT_COLOR_RET(normal); 16357 _FMT_COLOR_RET(normal);
16358} 16358}
16359 16359
16360static void 16360static void
16361_efl_canvas_textblock_efl_text_style_backing_type_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Style_Backing_Type type EINA_UNUSED) 16361_efl_canvas_textblock_efl_text_style_text_background_type_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Style_Background_Type type EINA_UNUSED)
16362{ 16362{
16363 ASYNC_BLOCK; 16363 ASYNC_BLOCK;
16364 _FMT_SET(backing, type); 16364 _FMT_SET(backing, type);
16365} 16365}
16366 16366
16367static Efl_Text_Style_Backing_Type 16367static Efl_Text_Style_Background_Type
16368_efl_canvas_textblock_efl_text_style_backing_type_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED) 16368_efl_canvas_textblock_efl_text_style_text_background_type_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
16369{ 16369{
16370 return _FMT(backing); 16370 return _FMT(backing);
16371} 16371}
16372 16372
16373static void 16373static void
16374_efl_canvas_textblock_efl_text_style_backing_color_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char r EINA_UNUSED, unsigned char g EINA_UNUSED, unsigned char b EINA_UNUSED, unsigned char a EINA_UNUSED) 16374_efl_canvas_textblock_efl_text_style_text_background_color_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char r EINA_UNUSED, unsigned char g EINA_UNUSED, unsigned char b EINA_UNUSED, unsigned char a EINA_UNUSED)
16375{ 16375{
16376 ASYNC_BLOCK; 16376 ASYNC_BLOCK;
16377 _FMT_COLOR_SET(backing); 16377 _FMT_COLOR_SET(backing);
16378} 16378}
16379 16379
16380static void 16380static void
16381_efl_canvas_textblock_efl_text_style_backing_color_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char *r EINA_UNUSED, unsigned char *g EINA_UNUSED, unsigned char *b EINA_UNUSED, unsigned char *a EINA_UNUSED) 16381_efl_canvas_textblock_efl_text_style_text_background_color_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char *r EINA_UNUSED, unsigned char *g EINA_UNUSED, unsigned char *b EINA_UNUSED, unsigned char *a EINA_UNUSED)
16382{ 16382{
16383 _FMT_COLOR_RET(backing); 16383 _FMT_COLOR_RET(backing);
16384} 16384}
@@ -16396,7 +16396,7 @@ static struct
16396}; 16396};
16397 16397
16398static void 16398static void
16399_efl_canvas_textblock_efl_text_style_underline_type_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Style_Underline_Type type EINA_UNUSED) 16399_efl_canvas_textblock_efl_text_style_text_underline_type_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Style_Underline_Type type EINA_UNUSED)
16400{ 16400{
16401 ASYNC_BLOCK; 16401 ASYNC_BLOCK;
16402 _FMT_SET(underline, _style_underline_map[type].underline_single); 16402 _FMT_SET(underline, _style_underline_map[type].underline_single);
@@ -16406,111 +16406,111 @@ _efl_canvas_textblock_efl_text_style_underline_type_set(Eo *obj EINA_UNUSED, Efl
16406} 16406}
16407 16407
16408static Efl_Text_Style_Underline_Type 16408static Efl_Text_Style_Underline_Type
16409_efl_canvas_textblock_efl_text_style_underline_type_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED) 16409_efl_canvas_textblock_efl_text_style_text_underline_type_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
16410{ 16410{
16411 return _FMT(underline); 16411 return _FMT(underline);
16412} 16412}
16413 16413
16414static void 16414static void
16415_efl_canvas_textblock_efl_text_style_underline_color_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char r EINA_UNUSED, unsigned char g EINA_UNUSED, unsigned char b EINA_UNUSED, unsigned char a EINA_UNUSED) 16415_efl_canvas_textblock_efl_text_style_text_underline_color_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char r EINA_UNUSED, unsigned char g EINA_UNUSED, unsigned char b EINA_UNUSED, unsigned char a EINA_UNUSED)
16416{ 16416{
16417 ASYNC_BLOCK; 16417 ASYNC_BLOCK;
16418 _FMT_COLOR_SET(underline); 16418 _FMT_COLOR_SET(underline);
16419} 16419}
16420 16420
16421static void 16421static void
16422_efl_canvas_textblock_efl_text_style_underline_color_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char *r EINA_UNUSED, unsigned char *g EINA_UNUSED, unsigned char *b EINA_UNUSED, unsigned char *a EINA_UNUSED) 16422_efl_canvas_textblock_efl_text_style_text_underline_color_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char *r EINA_UNUSED, unsigned char *g EINA_UNUSED, unsigned char *b EINA_UNUSED, unsigned char *a EINA_UNUSED)
16423{ 16423{
16424 _FMT_COLOR_RET(underline); 16424 _FMT_COLOR_RET(underline);
16425} 16425}
16426 16426
16427static void 16427static void
16428_efl_canvas_textblock_efl_text_style_underline_height_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, double height EINA_UNUSED) 16428_efl_canvas_textblock_efl_text_style_text_underline_height_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, double height EINA_UNUSED)
16429{ 16429{
16430 ASYNC_BLOCK; 16430 ASYNC_BLOCK;
16431 _FMT_SET(underline_height, height); 16431 _FMT_SET(underline_height, height);
16432} 16432}
16433 16433
16434static double 16434static double
16435_efl_canvas_textblock_efl_text_style_underline_height_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED) 16435_efl_canvas_textblock_efl_text_style_text_underline_height_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
16436{ 16436{
16437 return _FMT(underline_height); 16437 return _FMT(underline_height);
16438} 16438}
16439 16439
16440static void 16440static void
16441_efl_canvas_textblock_efl_text_style_underline_dashed_color_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char r EINA_UNUSED, unsigned char g EINA_UNUSED, unsigned char b EINA_UNUSED, unsigned char a EINA_UNUSED) 16441_efl_canvas_textblock_efl_text_style_text_underline_dashed_color_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char r EINA_UNUSED, unsigned char g EINA_UNUSED, unsigned char b EINA_UNUSED, unsigned char a EINA_UNUSED)
16442{ 16442{
16443 ASYNC_BLOCK; 16443 ASYNC_BLOCK;
16444 _FMT_COLOR_SET(underline_dash); 16444 _FMT_COLOR_SET(underline_dash);
16445} 16445}
16446 16446
16447static void 16447static void
16448_efl_canvas_textblock_efl_text_style_underline_dashed_color_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char *r EINA_UNUSED, unsigned char *g EINA_UNUSED, unsigned char *b EINA_UNUSED, unsigned char *a EINA_UNUSED) 16448_efl_canvas_textblock_efl_text_style_text_underline_dashed_color_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char *r EINA_UNUSED, unsigned char *g EINA_UNUSED, unsigned char *b EINA_UNUSED, unsigned char *a EINA_UNUSED)
16449{ 16449{
16450 _FMT_COLOR_RET(underline_dash); 16450 _FMT_COLOR_RET(underline_dash);
16451} 16451}
16452 16452
16453static void 16453static void
16454_efl_canvas_textblock_efl_text_style_underline_dashed_width_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, int width EINA_UNUSED) 16454_efl_canvas_textblock_efl_text_style_text_underline_dashed_width_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, int width EINA_UNUSED)
16455{ 16455{
16456 ASYNC_BLOCK; 16456 ASYNC_BLOCK;
16457 _FMT_SET(underline_dash_width, width); 16457 _FMT_SET(underline_dash_width, width);
16458} 16458}
16459 16459
16460static int 16460static int
16461_efl_canvas_textblock_efl_text_style_underline_dashed_width_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED) 16461_efl_canvas_textblock_efl_text_style_text_underline_dashed_width_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
16462{ 16462{
16463 return _FMT(underline_dash_width); 16463 return _FMT(underline_dash_width);
16464} 16464}
16465 16465
16466static void 16466static void
16467_efl_canvas_textblock_efl_text_style_underline_dashed_gap_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, int gap EINA_UNUSED) 16467_efl_canvas_textblock_efl_text_style_text_underline_dashed_gap_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, int gap EINA_UNUSED)
16468{ 16468{
16469 ASYNC_BLOCK; 16469 ASYNC_BLOCK;
16470 _FMT_SET(underline_dash_gap, gap); 16470 _FMT_SET(underline_dash_gap, gap);
16471} 16471}
16472 16472
16473static int 16473static int
16474_efl_canvas_textblock_efl_text_style_underline_dashed_gap_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED) 16474_efl_canvas_textblock_efl_text_style_text_underline_dashed_gap_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
16475{ 16475{
16476 return _FMT(underline_dash_width); 16476 return _FMT(underline_dash_width);
16477} 16477}
16478 16478
16479static void 16479static void
16480_efl_canvas_textblock_efl_text_style_underline2_color_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char r EINA_UNUSED, unsigned char g EINA_UNUSED, unsigned char b EINA_UNUSED, unsigned char a EINA_UNUSED) 16480_efl_canvas_textblock_efl_text_style_text_underline2_color_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char r EINA_UNUSED, unsigned char g EINA_UNUSED, unsigned char b EINA_UNUSED, unsigned char a EINA_UNUSED)
16481{ 16481{
16482 ASYNC_BLOCK; 16482 ASYNC_BLOCK;
16483 _FMT_COLOR_SET(underline2); 16483 _FMT_COLOR_SET(underline2);
16484} 16484}
16485 16485
16486static void 16486static void
16487_efl_canvas_textblock_efl_text_style_underline2_color_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char *r EINA_UNUSED, unsigned char *g EINA_UNUSED, unsigned char *b EINA_UNUSED, unsigned char *a EINA_UNUSED) 16487_efl_canvas_textblock_efl_text_style_text_underline2_color_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char *r EINA_UNUSED, unsigned char *g EINA_UNUSED, unsigned char *b EINA_UNUSED, unsigned char *a EINA_UNUSED)
16488{ 16488{
16489 _FMT_COLOR_RET(underline2); 16489 _FMT_COLOR_RET(underline2);
16490} 16490}
16491 16491
16492static void 16492static void
16493_efl_canvas_textblock_efl_text_style_strikethrough_type_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Style_Strikethrough_Type type EINA_UNUSED) 16493_efl_canvas_textblock_efl_text_style_text_strikethrough_type_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Style_Strikethrough_Type type EINA_UNUSED)
16494{ 16494{
16495 ASYNC_BLOCK; 16495 ASYNC_BLOCK;
16496 _FMT_SET(strikethrough, type); 16496 _FMT_SET(strikethrough, type);
16497} 16497}
16498 16498
16499static Efl_Text_Style_Strikethrough_Type 16499static Efl_Text_Style_Strikethrough_Type
16500_efl_canvas_textblock_efl_text_style_strikethrough_type_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED) 16500_efl_canvas_textblock_efl_text_style_text_strikethrough_type_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
16501{ 16501{
16502 return _FMT(strikethrough); 16502 return _FMT(strikethrough);
16503} 16503}
16504 16504
16505static void 16505static void
16506_efl_canvas_textblock_efl_text_style_strikethrough_color_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char r EINA_UNUSED, unsigned char g EINA_UNUSED, unsigned char b EINA_UNUSED, unsigned char a EINA_UNUSED) 16506_efl_canvas_textblock_efl_text_style_text_strikethrough_color_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char r EINA_UNUSED, unsigned char g EINA_UNUSED, unsigned char b EINA_UNUSED, unsigned char a EINA_UNUSED)
16507{ 16507{
16508 ASYNC_BLOCK; 16508 ASYNC_BLOCK;
16509 _FMT_COLOR_SET(strikethrough); 16509 _FMT_COLOR_SET(strikethrough);
16510} 16510}
16511 16511
16512static void 16512static void
16513_efl_canvas_textblock_efl_text_style_strikethrough_color_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char *r EINA_UNUSED, unsigned char *g EINA_UNUSED, unsigned char *b EINA_UNUSED, unsigned char *a EINA_UNUSED) 16513_efl_canvas_textblock_efl_text_style_text_strikethrough_color_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char *r EINA_UNUSED, unsigned char *g EINA_UNUSED, unsigned char *b EINA_UNUSED, unsigned char *a EINA_UNUSED)
16514{ 16514{
16515 _FMT_COLOR_RET(strikethrough); 16515 _FMT_COLOR_RET(strikethrough);
16516} 16516}
@@ -16578,7 +16578,7 @@ _get_dir_from_map(Efl_Text_Style_Shadow_Direction dir)
16578} 16578}
16579 16579
16580static void 16580static void
16581_efl_canvas_textblock_efl_text_style_effect_type_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Style_Effect_Type type EINA_UNUSED) 16581_efl_canvas_textblock_efl_text_style_text_effect_type_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Style_Effect_Type type EINA_UNUSED)
16582{ 16582{
16583 ASYNC_BLOCK; 16583 ASYNC_BLOCK;
16584 _FMT_INFO_SET_START(effect, type); 16584 _FMT_INFO_SET_START(effect, type);
@@ -16590,26 +16590,26 @@ _efl_canvas_textblock_efl_text_style_effect_type_set(Eo *obj EINA_UNUSED, Efl_Ca
16590} 16590}
16591 16591
16592static Efl_Text_Style_Effect_Type 16592static Efl_Text_Style_Effect_Type
16593_efl_canvas_textblock_efl_text_style_effect_type_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED) 16593_efl_canvas_textblock_efl_text_style_text_effect_type_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
16594{ 16594{
16595 return _FMT_INFO(effect); 16595 return _FMT_INFO(effect);
16596} 16596}
16597 16597
16598static void 16598static void
16599_efl_canvas_textblock_efl_text_style_outline_color_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char r EINA_UNUSED, unsigned char g EINA_UNUSED, unsigned char b EINA_UNUSED, unsigned char a EINA_UNUSED) 16599_efl_canvas_textblock_efl_text_style_text_outline_color_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char r EINA_UNUSED, unsigned char g EINA_UNUSED, unsigned char b EINA_UNUSED, unsigned char a EINA_UNUSED)
16600{ 16600{
16601 ASYNC_BLOCK; 16601 ASYNC_BLOCK;
16602 _FMT_COLOR_SET(outline); 16602 _FMT_COLOR_SET(outline);
16603} 16603}
16604 16604
16605static void 16605static void
16606_efl_canvas_textblock_efl_text_style_outline_color_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char *r EINA_UNUSED, unsigned char *g EINA_UNUSED, unsigned char *b EINA_UNUSED, unsigned char *a EINA_UNUSED) 16606_efl_canvas_textblock_efl_text_style_text_outline_color_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char *r EINA_UNUSED, unsigned char *g EINA_UNUSED, unsigned char *b EINA_UNUSED, unsigned char *a EINA_UNUSED)
16607{ 16607{
16608 _FMT_COLOR_RET(outline); 16608 _FMT_COLOR_RET(outline);
16609} 16609}
16610 16610
16611static void 16611static void
16612_efl_canvas_textblock_efl_text_style_shadow_direction_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Style_Shadow_Direction type EINA_UNUSED) 16612_efl_canvas_textblock_efl_text_style_text_shadow_direction_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Style_Shadow_Direction type EINA_UNUSED)
16613{ 16613{
16614 ASYNC_BLOCK; 16614 ASYNC_BLOCK;
16615 _FMT_INFO_SET_START(shadow_direction, type); 16615 _FMT_INFO_SET_START(shadow_direction, type);
@@ -16619,52 +16619,52 @@ _efl_canvas_textblock_efl_text_style_shadow_direction_set(Eo *obj EINA_UNUSED, E
16619} 16619}
16620 16620
16621static Efl_Text_Style_Shadow_Direction 16621static Efl_Text_Style_Shadow_Direction
16622_efl_canvas_textblock_efl_text_style_shadow_direction_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED) 16622_efl_canvas_textblock_efl_text_style_text_shadow_direction_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
16623{ 16623{
16624 return _FMT_INFO(shadow_direction); 16624 return _FMT_INFO(shadow_direction);
16625} 16625}
16626 16626
16627static void 16627static void
16628_efl_canvas_textblock_efl_text_style_shadow_color_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char r EINA_UNUSED, unsigned char g EINA_UNUSED, unsigned char b EINA_UNUSED, unsigned char a EINA_UNUSED) 16628_efl_canvas_textblock_efl_text_style_text_shadow_color_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char r EINA_UNUSED, unsigned char g EINA_UNUSED, unsigned char b EINA_UNUSED, unsigned char a EINA_UNUSED)
16629{ 16629{
16630 ASYNC_BLOCK; 16630 ASYNC_BLOCK;
16631 _FMT_COLOR_SET(shadow); 16631 _FMT_COLOR_SET(shadow);
16632} 16632}
16633 16633
16634static void 16634static void
16635_efl_canvas_textblock_efl_text_style_shadow_color_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char *r EINA_UNUSED, unsigned char *g EINA_UNUSED, unsigned char *b EINA_UNUSED, unsigned char *a EINA_UNUSED) 16635_efl_canvas_textblock_efl_text_style_text_shadow_color_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char *r EINA_UNUSED, unsigned char *g EINA_UNUSED, unsigned char *b EINA_UNUSED, unsigned char *a EINA_UNUSED)
16636{ 16636{
16637 _FMT_COLOR_RET(shadow); 16637 _FMT_COLOR_RET(shadow);
16638} 16638}
16639 16639
16640static void 16640static void
16641_efl_canvas_textblock_efl_text_style_glow_color_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char r EINA_UNUSED, unsigned char g EINA_UNUSED, unsigned char b EINA_UNUSED, unsigned char a EINA_UNUSED) 16641_efl_canvas_textblock_efl_text_style_text_glow_color_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char r EINA_UNUSED, unsigned char g EINA_UNUSED, unsigned char b EINA_UNUSED, unsigned char a EINA_UNUSED)
16642{ 16642{
16643 ASYNC_BLOCK; 16643 ASYNC_BLOCK;
16644 _FMT_COLOR_SET(glow); 16644 _FMT_COLOR_SET(glow);
16645} 16645}
16646 16646
16647static void 16647static void
16648_efl_canvas_textblock_efl_text_style_glow_color_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char *r EINA_UNUSED, unsigned char *g EINA_UNUSED, unsigned char *b EINA_UNUSED, unsigned char *a EINA_UNUSED) 16648_efl_canvas_textblock_efl_text_style_text_glow_color_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char *r EINA_UNUSED, unsigned char *g EINA_UNUSED, unsigned char *b EINA_UNUSED, unsigned char *a EINA_UNUSED)
16649{ 16649{
16650 _FMT_COLOR_RET(glow); 16650 _FMT_COLOR_RET(glow);
16651} 16651}
16652 16652
16653static void 16653static void
16654_efl_canvas_textblock_efl_text_style_glow2_color_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char r EINA_UNUSED, unsigned char g EINA_UNUSED, unsigned char b EINA_UNUSED, unsigned char a EINA_UNUSED) 16654_efl_canvas_textblock_efl_text_style_text_glow2_color_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char r EINA_UNUSED, unsigned char g EINA_UNUSED, unsigned char b EINA_UNUSED, unsigned char a EINA_UNUSED)
16655{ 16655{
16656 ASYNC_BLOCK; 16656 ASYNC_BLOCK;
16657 _FMT_COLOR_SET(glow2); 16657 _FMT_COLOR_SET(glow2);
16658} 16658}
16659 16659
16660static void 16660static void
16661_efl_canvas_textblock_efl_text_style_glow2_color_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char *r EINA_UNUSED, unsigned char *g EINA_UNUSED, unsigned char *b EINA_UNUSED, unsigned char *a EINA_UNUSED) 16661_efl_canvas_textblock_efl_text_style_text_glow2_color_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char *r EINA_UNUSED, unsigned char *g EINA_UNUSED, unsigned char *b EINA_UNUSED, unsigned char *a EINA_UNUSED)
16662{ 16662{
16663 _FMT_COLOR_RET(glow2); 16663 _FMT_COLOR_RET(glow2);
16664} 16664}
16665 16665
16666static void 16666static void
16667_efl_canvas_textblock_efl_text_style_gfx_filter_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, 16667_efl_canvas_textblock_efl_text_style_text_gfx_filter_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED,
16668 const char *gfx_filter_name) 16668 const char *gfx_filter_name)
16669{ 16669{
16670 ASYNC_BLOCK; 16670 ASYNC_BLOCK;
@@ -16688,7 +16688,7 @@ _efl_canvas_textblock_efl_text_style_gfx_filter_set(Eo *obj EINA_UNUSED, Efl_Can
16688} 16688}
16689 16689
16690static const char * 16690static const char *
16691_efl_canvas_textblock_efl_text_style_gfx_filter_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED) 16691_efl_canvas_textblock_efl_text_style_text_gfx_filter_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
16692{ 16692{
16693 return _FMT(gfx_filter)?_FMT(gfx_filter->name):NULL; 16693 return _FMT(gfx_filter)?_FMT(gfx_filter->name):NULL;
16694} 16694}
diff --git a/src/tests/edje/edje_test_text.c b/src/tests/edje/edje_test_text.c
index fc5e67a442..a66132c1d8 100644
--- a/src/tests/edje/edje_test_text.c
+++ b/src/tests/edje/edje_test_text.c
@@ -180,7 +180,7 @@ START_TEST(edje_test_text_color)
180 efl_file_key_set(layout, "test"); 180 efl_file_key_set(layout, "test");
181 ck_assert(!efl_file_load(layout)); 181 ck_assert(!efl_file_load(layout));
182 182
183 efl_text_normal_color_set(efl_part(layout, "text"), 255, 255, 255, 255); 183 efl_text_color_set(efl_part(layout, "text"), 255, 255, 255, 255);
184 184
185} 185}
186END_TEST 186END_TEST
@@ -195,9 +195,9 @@ _basic_check(Eo *layout, Eina_Bool set)
195 // Just normal_color is enough 195 // Just normal_color is enough
196 if (set) 196 if (set)
197 { 197 {
198 efl_text_normal_color_set(efl_part(layout, "text"), 198 efl_text_color_set(efl_part(layout, "text"),
199 255, 255, 255, 255); 199 255, 255, 255, 255);
200 efl_text_backing_color_set(efl_part(layout, "text"), 200 efl_text_background_color_set(efl_part(layout, "text"),
201 255, 255, 255, 255); 201 255, 255, 255, 255);
202 efl_text_glow_color_set(efl_part(layout, "text"), 202 efl_text_glow_color_set(efl_part(layout, "text"),
203 255, 255, 255, 255); 203 255, 255, 255, 255);
@@ -217,13 +217,13 @@ _basic_check(Eo *layout, Eina_Bool set)
217 255, 255, 255, 255); 217 255, 255, 255, 255);
218 } 218 }
219 219
220 efl_text_normal_color_get(efl_part(layout, "text"), &r, &g, &b, &a); 220 efl_text_color_get(efl_part(layout, "text"), &r, &g, &b, &a);
221 ck_assert_int_eq(r, 255); 221 ck_assert_int_eq(r, 255);
222 ck_assert_int_eq(g, 255); 222 ck_assert_int_eq(g, 255);
223 ck_assert_int_eq(b, 255); 223 ck_assert_int_eq(b, 255);
224 ck_assert_int_eq(a, 255); 224 ck_assert_int_eq(a, 255);
225 225
226 efl_text_backing_color_get(efl_part(layout, "text"), &r, &g, &b, &a); 226 efl_text_background_color_get(efl_part(layout, "text"), &r, &g, &b, &a);
227 ck_assert_int_eq(r, 255); 227 ck_assert_int_eq(r, 255);
228 ck_assert_int_eq(g, 255); 228 ck_assert_int_eq(g, 255);
229 ck_assert_int_eq(b, 255); 229 ck_assert_int_eq(b, 255);
diff --git a/src/tests/evas/evas_test_textblock.c b/src/tests/evas/evas_test_textblock.c
index 94849a57e1..e2442c7163 100644
--- a/src/tests/evas/evas_test_textblock.c
+++ b/src/tests/evas/evas_test_textblock.c
@@ -4649,7 +4649,7 @@ EFL_START_TEST(efl_canvas_textblock_style)
4649 ck_assert_int_eq(efl_text_wrap_get(txt), EFL_TEXT_FORMAT_WRAP_NONE); 4649 ck_assert_int_eq(efl_text_wrap_get(txt), EFL_TEXT_FORMAT_WRAP_NONE);
4650 4650
4651 efl_canvas_textblock_style_apply(txt, "backing=on"); 4651 efl_canvas_textblock_style_apply(txt, "backing=on");
4652 ck_assert_int_eq(efl_text_backing_type_get(txt), EFL_TEXT_STYLE_BACKING_TYPE_ENABLED); 4652 ck_assert_int_eq(efl_text_background_type_get(txt), EFL_TEXT_STYLE_BACKGROUND_TYPE_ENABLED);
4653 4653
4654 efl_canvas_textblock_style_apply(txt, "style=far_soft_shadow"); 4654 efl_canvas_textblock_style_apply(txt, "style=far_soft_shadow");
4655 ck_assert_int_eq(efl_text_effect_type_get(txt), EFL_TEXT_STYLE_EFFECT_TYPE_FAR_SOFT_SHADOW); 4655 ck_assert_int_eq(efl_text_effect_type_get(txt), EFL_TEXT_STYLE_EFFECT_TYPE_FAR_SOFT_SHADOW);
@@ -4667,7 +4667,7 @@ EFL_START_TEST(efl_canvas_textblock_style)
4667 ck_assert_int_eq(efl_text_shadow_direction_get(txt), EFL_TEXT_STYLE_SHADOW_DIRECTION_BOTTOM); 4667 ck_assert_int_eq(efl_text_shadow_direction_get(txt), EFL_TEXT_STYLE_SHADOW_DIRECTION_BOTTOM);
4668 4668
4669 efl_canvas_textblock_style_apply(txt, "color=#EF596C"); 4669 efl_canvas_textblock_style_apply(txt, "color=#EF596C");
4670 efl_text_normal_color_get(txt, &r, &g, &b, &a); 4670 efl_text_color_get(txt, &r, &g, &b, &a);
4671 ck_assert_int_eq(r, 0xEF); 4671 ck_assert_int_eq(r, 0xEF);
4672 ck_assert_int_eq(g, 0x59); 4672 ck_assert_int_eq(g, 0x59);
4673 ck_assert_int_eq(b, 0x6C); 4673 ck_assert_int_eq(b, 0x6C);