summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2018-02-12 16:02:06 -0500
committerMike Blumenkrantz <zmike@osg.samsung.com>2018-02-12 16:38:51 -0500
commitf85325d924d93e84ffee08b7bffd39d33347998f (patch)
tree802baed979afeeeb929f5b3c3c996ee5ce870f0a /src/lib
parent05200163ed7461d3904bd9320dc9b578269f8bd9 (diff)
interfaces: remove Efl.Text.Properties
this is provided in Efl.Text.Font
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/edje/edje_text.c40
-rw-r--r--src/lib/efl/CMakeLists.txt1
-rw-r--r--src/lib/efl/Efl.h1
-rw-r--r--src/lib/efl/interfaces/efl_interfaces_main.c1
-rw-r--r--src/lib/efl/interfaces/efl_text_font.eo2
-rw-r--r--src/lib/efl/interfaces/efl_text_properties.eo60
-rw-r--r--src/lib/evas/canvas/efl_canvas_text.eo2
-rw-r--r--src/lib/evas/canvas/evas_object_text.c20
-rw-r--r--src/lib/evas/canvas/evas_object_textgrid.c20
-rw-r--r--src/lib/evas/canvas/evas_text.eo6
-rw-r--r--src/lib/evas/canvas/evas_textgrid.eo8
11 files changed, 49 insertions, 112 deletions
diff --git a/src/lib/edje/edje_text.c b/src/lib/edje/edje_text.c
index 8f88f490e0..176c20df1b 100644
--- a/src/lib/edje/edje_text.c
+++ b/src/lib/edje/edje_text.c
@@ -141,7 +141,7 @@ _edje_text_fit_x(Edje *ed, Edje_Real_Part *ep,
141 if (ep->part->scale) evas_object_scale_set(ep->object, TO_DOUBLE(sc)); 141 if (ep->part->scale) evas_object_scale_set(ep->object, TO_DOUBLE(sc));
142 142
143 evas_obj_text_ellipsis_set(ep->object, params->type.text->ellipsis); 143 evas_obj_text_ellipsis_set(ep->object, params->type.text->ellipsis);
144 efl_text_properties_font_set(ep->object, font, size); 144 efl_text_font_set(ep->object, font, size);
145 efl_text_set(ep->object, text); 145 efl_text_set(ep->object, text);
146 efl_gfx_size_set(ep->object, EINA_SIZE2D(sw, sh)); 146 efl_gfx_size_set(ep->object, EINA_SIZE2D(sw, sh));
147 147
@@ -333,8 +333,8 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
333 ep->typedata.text->cache.in_size = size; 333 ep->typedata.text->cache.in_size = size;
334 if (chosen_desc->text.fit_x && (ep->typedata.text->cache.in_str && eina_stringshare_strlen(ep->typedata.text->cache.in_str) > 0)) 334 if (chosen_desc->text.fit_x && (ep->typedata.text->cache.in_str && eina_stringshare_strlen(ep->typedata.text->cache.in_str) > 0))
335 { 335 {
336 if (inlined_font) efl_text_properties_font_source_set(ep->object, ed->path); 336 if (inlined_font) efl_text_font_source_set(ep->object, ed->path);
337 else efl_text_properties_font_source_set(ep->object, NULL); 337 else efl_text_font_source_set(ep->object, NULL);
338 338
339 if (ep->part->scale) efl_gfx_scale_set(ep->object, TO_DOUBLE(sc)); 339 if (ep->part->scale) efl_gfx_scale_set(ep->object, TO_DOUBLE(sc));
340 340
@@ -342,16 +342,16 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
342 /* the fit shoult not depend on font size, because it give the differet 342 /* the fit shoult not depend on font size, because it give the differet
343 * size calculation. As base font size for calculate fit size I take 343 * size calculation. As base font size for calculate fit size I take
344 * 10 (ten), because this value used for calculate fit by Y below */ 344 * 10 (ten), because this value used for calculate fit by Y below */
345 efl_text_properties_font_set(ep->object, font, 10); 345 efl_text_font_set(ep->object, font, 10);
346 part_get_geometry(ep, &tw, &th); 346 part_get_geometry(ep, &tw, &th);
347 347
348 size = (10 * sw) / tw; 348 size = (10 * sw) / tw;
349 efl_text_properties_font_set(ep->object, font, size); 349 efl_text_font_set(ep->object, font, size);
350 part_get_geometry(ep, &tw, &th); 350 part_get_geometry(ep, &tw, &th);
351 while ((tw > sw) && (size > 1)) 351 while ((tw > sw) && (size > 1))
352 { 352 {
353 size--; 353 size--;
354 efl_text_properties_font_set(ep->object, font, size); 354 efl_text_font_set(ep->object, font, size);
355 part_get_geometry(ep, &tw, &th); 355 part_get_geometry(ep, &tw, &th);
356 } 356 }
357 } 357 }
@@ -363,12 +363,12 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
363 */ 363 */
364 if (!chosen_desc->text.fit_x) size = sh; 364 if (!chosen_desc->text.fit_x) size = sh;
365 365
366 if (inlined_font) efl_text_properties_font_source_set(ep->object, ed->path); 366 if (inlined_font) efl_text_font_source_set(ep->object, ed->path);
367 else efl_text_properties_font_source_set(ep->object, NULL); 367 else efl_text_font_source_set(ep->object, NULL);
368 368
369 if (ep->part->scale) efl_gfx_scale_set(ep->object, TO_DOUBLE(sc)); 369 if (ep->part->scale) efl_gfx_scale_set(ep->object, TO_DOUBLE(sc));
370 370
371 efl_text_properties_font_set(ep->object, font, size); 371 efl_text_font_set(ep->object, font, size);
372 efl_text_set(ep->object, text); 372 efl_text_set(ep->object, text);
373 part_get_geometry(ep, &tw, &th); 373 part_get_geometry(ep, &tw, &th);
374 374
@@ -386,11 +386,11 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
386 size += dif; 386 size += dif;
387 if (size <= 0) break; 387 if (size <= 0) break;
388 388
389 if (inlined_font) efl_text_properties_font_source_set(ep->object, ed->path); 389 if (inlined_font) efl_text_font_source_set(ep->object, ed->path);
390 else efl_text_properties_font_source_set(ep->object, NULL); 390 else efl_text_font_source_set(ep->object, NULL);
391 391
392 if (ep->part->scale) efl_gfx_scale_set(ep->object, TO_DOUBLE(sc)); 392 if (ep->part->scale) efl_gfx_scale_set(ep->object, TO_DOUBLE(sc));
393 efl_text_properties_font_set(ep->object, font, size); 393 efl_text_font_set(ep->object, font, size);
394 394
395 part_get_geometry(ep, &tw, &th); 395 part_get_geometry(ep, &tw, &th);
396 if ((size > 0) && (th == 0)) break; 396 if ((size > 0) && (th == 0)) break;
@@ -402,7 +402,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
402 int current; 402 int current;
403 403
404 if (ep->part->scale) efl_gfx_scale_set(ep->object, TO_DOUBLE(sc)); 404 if (ep->part->scale) efl_gfx_scale_set(ep->object, TO_DOUBLE(sc));
405 efl_text_properties_font_set(ep->object, font, 10); 405 efl_text_font_set(ep->object, font, 10);
406 406
407 part_get_geometry(ep, &tw, &th); 407 part_get_geometry(ep, &tw, &th);
408 408
@@ -424,7 +424,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
424 current = (top + bottom) / 2; 424 current = (top + bottom) / 2;
425 425
426 if (ep->part->scale) efl_gfx_scale_set(ep->object, TO_DOUBLE(sc)); 426 if (ep->part->scale) efl_gfx_scale_set(ep->object, TO_DOUBLE(sc));
427 efl_text_properties_font_set(ep->object, font, current); 427 efl_text_font_set(ep->object, font, current);
428 428
429 part_get_geometry(ep, &tw, &th); 429 part_get_geometry(ep, &tw, &th);
430 430
@@ -440,7 +440,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
440 current++; 440 current++;
441 441
442 if (ep->part->scale) efl_gfx_scale_set(ep->object, TO_DOUBLE(sc)); 442 if (ep->part->scale) efl_gfx_scale_set(ep->object, TO_DOUBLE(sc));
443 efl_text_properties_font_set(ep->object, font, current); 443 efl_text_font_set(ep->object, font, current);
444 444
445 part_get_geometry(ep, &tw, &th); 445 part_get_geometry(ep, &tw, &th);
446 } while (th <= sh); 446 } while (th <= sh);
@@ -460,8 +460,8 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
460 /* Handle ellipsis */ 460 /* Handle ellipsis */
461 if (!chosen_desc->text.min_x) 461 if (!chosen_desc->text.min_x)
462 { 462 {
463 if (inlined_font) efl_text_properties_font_source_set(ep->object, ed->path); 463 if (inlined_font) efl_text_font_source_set(ep->object, ed->path);
464 else efl_text_properties_font_source_set(ep->object, NULL); 464 else efl_text_font_source_set(ep->object, NULL);
465 465
466 text = _edje_text_fit_x(ed, ep, params, chosen_desc, 466 text = _edje_text_fit_x(ed, ep, params, chosen_desc,
467 text, font, size, 467 text, font, size,
@@ -485,12 +485,12 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
485 ep->typedata.text->cache.fit_y = chosen_desc->text.fit_y; 485 ep->typedata.text->cache.fit_y = chosen_desc->text.fit_y;
486arrange_text: 486arrange_text:
487 487
488 if (inlined_font) efl_text_properties_font_source_set(ep->object, ed->path); 488 if (inlined_font) efl_text_font_source_set(ep->object, ed->path);
489 else efl_text_properties_font_source_set(ep->object, NULL); 489 else efl_text_font_source_set(ep->object, NULL);
490 490
491 if (ep->part->scale) efl_gfx_scale_set(ep->object, TO_DOUBLE(sc)); 491 if (ep->part->scale) efl_gfx_scale_set(ep->object, TO_DOUBLE(sc));
492 492
493 efl_text_properties_font_set(ep->object, font, size); 493 efl_text_font_set(ep->object, font, size);
494 efl_text_set(ep->object, text); 494 efl_text_set(ep->object, text);
495 part_get_geometry(ep, &tw, &th); 495 part_get_geometry(ep, &tw, &th);
496 496
diff --git a/src/lib/efl/CMakeLists.txt b/src/lib/efl/CMakeLists.txt
index dde72d7039..909cea5b5b 100644
--- a/src/lib/efl/CMakeLists.txt
+++ b/src/lib/efl/CMakeLists.txt
@@ -48,7 +48,6 @@ set(PUBLIC_EO_FILES
48 interfaces/efl_player.eo 48 interfaces/efl_player.eo
49 interfaces/efl_screen.eo 49 interfaces/efl_screen.eo
50 interfaces/efl_text.eo 50 interfaces/efl_text.eo
51 interfaces/efl_text_properties.eo
52 interfaces/efl_text_types.eot 51 interfaces/efl_text_types.eot
53 interfaces/efl_types.eot 52 interfaces/efl_types.eot
54 interfaces/efl_ui_item.eo 53 interfaces/efl_ui_item.eo
diff --git a/src/lib/efl/Efl.h b/src/lib/efl/Efl.h
index 5f47825b0c..cf3f17305d 100644
--- a/src/lib/efl/Efl.h
+++ b/src/lib/efl/Efl.h
@@ -86,7 +86,6 @@ typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command;
86#include "interfaces/efl_player.eo.h" 86#include "interfaces/efl_player.eo.h"
87#include "interfaces/efl_text.eo.h" 87#include "interfaces/efl_text.eo.h"
88#include "interfaces/efl_text_types.eot.h" 88#include "interfaces/efl_text_types.eot.h"
89#include "interfaces/efl_text_properties.eo.h"
90#include "interfaces/efl_orientation.eo.h" 89#include "interfaces/efl_orientation.eo.h"
91#include "interfaces/efl_ui_base.eo.h" 90#include "interfaces/efl_ui_base.eo.h"
92#include "interfaces/efl_ui_direction.eo.h" 91#include "interfaces/efl_ui_direction.eo.h"
diff --git a/src/lib/efl/interfaces/efl_interfaces_main.c b/src/lib/efl/interfaces/efl_interfaces_main.c
index 1419f747b3..8934b2ecde 100644
--- a/src/lib/efl/interfaces/efl_interfaces_main.c
+++ b/src/lib/efl/interfaces/efl_interfaces_main.c
@@ -18,7 +18,6 @@
18#include "interfaces/efl_playable.eo.c" 18#include "interfaces/efl_playable.eo.c"
19#include "interfaces/efl_player.eo.c" 19#include "interfaces/efl_player.eo.c"
20#include "interfaces/efl_text.eo.c" 20#include "interfaces/efl_text.eo.c"
21#include "interfaces/efl_text_properties.eo.c"
22#include "interfaces/efl_text_font.eo.c" 21#include "interfaces/efl_text_font.eo.c"
23#include "interfaces/efl_text_style.eo.c" 22#include "interfaces/efl_text_style.eo.c"
24#include "interfaces/efl_text_format.eo.c" 23#include "interfaces/efl_text_format.eo.c"
diff --git a/src/lib/efl/interfaces/efl_text_font.eo b/src/lib/efl/interfaces/efl_text_font.eo
index 8a27829541..4daf73aef2 100644
--- a/src/lib/efl/interfaces/efl_text_font.eo
+++ b/src/lib/efl/interfaces/efl_text_font.eo
@@ -1,5 +1,5 @@
1// src/lib/efl/interfaces/efl_text_font.eo 1// src/lib/efl/interfaces/efl_text_font.eo
2 2import efl_gfx_types;
3enum Efl.Text.Font.Weight { 3enum Efl.Text.Font.Weight {
4 [[Type of font weight]] 4 [[Type of font weight]]
5 normal, [[Normal font weight]] 5 normal, [[Normal font weight]]
diff --git a/src/lib/efl/interfaces/efl_text_properties.eo b/src/lib/efl/interfaces/efl_text_properties.eo
deleted file mode 100644
index 8552fae4dd..0000000000
--- a/src/lib/efl/interfaces/efl_text_properties.eo
+++ /dev/null
@@ -1,60 +0,0 @@
1import efl_gfx_types;
2
3interface Efl.Text.Properties
4{
5 [[Efl text properties interface]]
6 methods {
7 @property font {
8 set {
9 [[Set the font family, filename and size for a given text object.
10
11 This function allows the font name and size of a text object to
12 be set. The font string has to follow fontconfig's convention for
13 naming fonts, as it's the underlying library used to query system
14 fonts by Evas (see the fc-list command's output, on your system,
15 to get an idea). Alternatively, youe can use the full path to a font
16 file.
17
18 See also @.font.get, @.font_source.get.
19 ]]
20 }
21 get {
22 [[Retrieve the font family and size in use on a given text object.
23
24 This function allows the font name and size of a text object to
25 be queried. Remember that the font name string is still owned by
26 Evas and should not have free() called on it by the caller of the
27 function.
28
29 See also @.font.set.
30 ]]
31 }
32 values {
33 font: string; [[The font family name or filename.]]
34 size: Efl.Font.Size; [[The font size, in points.]]
35 }
36 }
37 @property font_source {
38 set {
39 [[Set the font (source) file to be used on a given text object.
40
41 This function allows the font file to be explicitly set for a
42 given text object, overriding system lookup, which will first
43 occur in the given file's contents.
44
45 See also @.font.set.
46 ]]
47 }
48 get {
49 [[Get the font file's path which is being used on a given text
50 object.
51
52 See @.font.get for more details.
53 ]]
54 }
55 values {
56 font_source: string; [[The font file's path.]]
57 }
58 }
59 }
60}
diff --git a/src/lib/evas/canvas/efl_canvas_text.eo b/src/lib/evas/canvas/efl_canvas_text.eo
index 73367b0f58..87eac29e73 100644
--- a/src/lib/evas/canvas/efl_canvas_text.eo
+++ b/src/lib/evas/canvas/efl_canvas_text.eo
@@ -2,7 +2,7 @@ import efl_text_types;
2 2
3struct Efl.Canvas.Text.Style; [[EFL text style data structure]] 3struct Efl.Canvas.Text.Style; [[EFL text style data structure]]
4 4
5class Efl.Canvas.Text (Efl.Canvas.Object, Efl.Text, Efl.Text.Properties, 5class Efl.Canvas.Text (Efl.Canvas.Object, Efl.Text,
6 Efl.Canvas.Filter.Internal, Efl.Text.Font, 6 Efl.Canvas.Filter.Internal, Efl.Text.Font,
7 Efl.Text.Style, Efl.Text.Format, Efl.Text.Cursor, 7 Efl.Text.Style, Efl.Text.Format, Efl.Text.Cursor,
8 Efl.Text.Annotate, Efl.Text.Markup, Efl.Ui.Base) 8 Efl.Text.Annotate, Efl.Text.Markup, Efl.Ui.Base)
diff --git a/src/lib/evas/canvas/evas_object_text.c b/src/lib/evas/canvas/evas_object_text.c
index 5145be615d..b9fc13cf9f 100644
--- a/src/lib/evas/canvas/evas_object_text.c
+++ b/src/lib/evas/canvas/evas_object_text.c
@@ -392,7 +392,7 @@ _evas_text_efl_object_constructor(Eo *eo_obj, Evas_Text_Data *o EINA_UNUSED)
392} 392}
393 393
394EOLIAN static void 394EOLIAN static void
395_evas_text_efl_text_properties_font_source_set(Eo *eo_obj, Evas_Text_Data *o, const char *font_source) 395_evas_text_efl_text_font_font_source_set(Eo *eo_obj, Evas_Text_Data *o, const char *font_source)
396{ 396{
397 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 397 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
398 if (((o->cur.source) && (font_source) && 398 if (((o->cur.source) && (font_source) &&
@@ -409,7 +409,7 @@ _evas_text_efl_text_properties_font_source_set(Eo *eo_obj, Evas_Text_Data *o, co
409} 409}
410 410
411EOLIAN static const char* 411EOLIAN static const char*
412_evas_text_efl_text_properties_font_source_get(Eo *eo_obj EINA_UNUSED, Evas_Text_Data *o) 412_evas_text_efl_text_font_font_source_get(Eo *eo_obj EINA_UNUSED, Evas_Text_Data *o)
413{ 413{
414 return o->cur.source; 414 return o->cur.source;
415} 415}
@@ -465,7 +465,7 @@ _evas_text_font_reload(Eo *eo_obj, Evas_Text_Data *o)
465} 465}
466 466
467EOLIAN static void 467EOLIAN static void
468_evas_text_efl_text_properties_font_set(Eo *eo_obj, Evas_Text_Data *o, const char *font, Evas_Font_Size size) 468_evas_text_efl_text_font_font_set(Eo *eo_obj, Evas_Text_Data *o, const char *font, Evas_Font_Size size)
469{ 469{
470 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 470 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
471 Evas_Font_Description *fdesc; 471 Evas_Font_Description *fdesc;
@@ -503,7 +503,7 @@ _evas_text_efl_text_properties_font_set(Eo *eo_obj, Evas_Text_Data *o, const cha
503} 503}
504 504
505EOLIAN static void 505EOLIAN static void
506_evas_text_efl_text_properties_font_get(Eo *eo_obj EINA_UNUSED, Evas_Text_Data *o, const char **font, Evas_Font_Size *size) 506_evas_text_efl_text_font_font_get(Eo *eo_obj EINA_UNUSED, Evas_Text_Data *o, const char **font, Evas_Font_Size *size)
507{ 507{
508 if (font) *font = o->cur.font; 508 if (font) *font = o->cur.font;
509 if (size) *size = o->cur.size; 509 if (size) *size = o->cur.size;
@@ -1054,11 +1054,11 @@ _evas_text_efl_object_dbg_info_get(Eo *eo_obj, Evas_Text_Data *o EINA_UNUSED, Ef
1054 1054
1055 const char *text; 1055 const char *text;
1056 int size; 1056 int size;
1057 efl_text_properties_font_get(eo_obj, &text, &size); 1057 efl_text_font_get(eo_obj, &text, &size);
1058 EFL_DBG_INFO_APPEND(group, "Font", EINA_VALUE_TYPE_STRING, text); 1058 EFL_DBG_INFO_APPEND(group, "Font", EINA_VALUE_TYPE_STRING, text);
1059 EFL_DBG_INFO_APPEND(group, "Text size", EINA_VALUE_TYPE_INT, size); 1059 EFL_DBG_INFO_APPEND(group, "Text size", EINA_VALUE_TYPE_INT, size);
1060 1060
1061 text = efl_text_properties_font_source_get(eo_obj); 1061 text = efl_text_font_source_get(eo_obj);
1062 EFL_DBG_INFO_APPEND(group, "Font source", EINA_VALUE_TYPE_STRING, text); 1062 EFL_DBG_INFO_APPEND(group, "Font source", EINA_VALUE_TYPE_STRING, text);
1063 1063
1064 text = efl_text_get(eo_obj); 1064 text = efl_text_get(eo_obj);
@@ -2348,27 +2348,27 @@ _evas_object_text_recalc(Evas_Object *eo_obj, Eina_Unicode *text)
2348EAPI void 2348EAPI void
2349evas_object_text_font_source_set(Eo *obj, const char *font_source) 2349evas_object_text_font_source_set(Eo *obj, const char *font_source)
2350{ 2350{
2351 efl_text_properties_font_source_set((Eo *) obj, font_source); 2351 efl_text_font_source_set((Eo *) obj, font_source);
2352} 2352}
2353 2353
2354EAPI const char * 2354EAPI const char *
2355evas_object_text_font_source_get(const Eo *obj) 2355evas_object_text_font_source_get(const Eo *obj)
2356{ 2356{
2357 const char *font_source = 0; 2357 const char *font_source = 0;
2358 font_source = efl_text_properties_font_source_get((Eo *) obj); 2358 font_source = efl_text_font_source_get((Eo *) obj);
2359 return font_source; 2359 return font_source;
2360} 2360}
2361 2361
2362EAPI void 2362EAPI void
2363evas_object_text_font_set(Eo *obj, const char *font, Evas_Font_Size size) 2363evas_object_text_font_set(Eo *obj, const char *font, Evas_Font_Size size)
2364{ 2364{
2365 efl_text_properties_font_set((Eo *) obj, font, size); 2365 efl_text_font_set((Eo *) obj, font, size);
2366} 2366}
2367 2367
2368EAPI void 2368EAPI void
2369evas_object_text_font_get(const Eo *obj, const char **font, Evas_Font_Size *size) 2369evas_object_text_font_get(const Eo *obj, const char **font, Evas_Font_Size *size)
2370{ 2370{
2371 efl_text_properties_font_get((Eo *) obj, font, size); 2371 efl_text_font_get((Eo *) obj, font, size);
2372} 2372}
2373 2373
2374EAPI void 2374EAPI void
diff --git a/src/lib/evas/canvas/evas_object_textgrid.c b/src/lib/evas/canvas/evas_object_textgrid.c
index 2402170a6c..e0ea4c93ea 100644
--- a/src/lib/evas/canvas/evas_object_textgrid.c
+++ b/src/lib/evas/canvas/evas_object_textgrid.c
@@ -966,7 +966,7 @@ _evas_textgrid_size_get(Eo *eo_obj EINA_UNUSED, Evas_Textgrid_Data *o, int *w, i
966} 966}
967 967
968EOLIAN static void 968EOLIAN static void
969_evas_textgrid_efl_text_properties_font_source_set(Eo *eo_obj, Evas_Textgrid_Data *o, const char *font_source) 969_evas_textgrid_efl_text_font_font_source_set(Eo *eo_obj, Evas_Textgrid_Data *o, const char *font_source)
970{ 970{
971 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 971 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
972 972
@@ -984,7 +984,7 @@ _evas_textgrid_efl_text_properties_font_source_set(Eo *eo_obj, Evas_Textgrid_Dat
984} 984}
985 985
986EOLIAN static const char* 986EOLIAN static const char*
987_evas_textgrid_efl_text_properties_font_source_get(Eo *eo_obj EINA_UNUSED, Evas_Textgrid_Data *o) 987_evas_textgrid_efl_text_font_font_source_get(Eo *eo_obj EINA_UNUSED, Evas_Textgrid_Data *o)
988{ 988{
989 return o->cur.font_source; 989 return o->cur.font_source;
990} 990}
@@ -1221,7 +1221,7 @@ _evas_textgrid_font_reload(Eo *eo_obj, Evas_Textgrid_Data *o)
1221} 1221}
1222 1222
1223EOLIAN static void 1223EOLIAN static void
1224_evas_textgrid_efl_text_properties_font_set(Eo *eo_obj, 1224_evas_textgrid_efl_text_font_font_set(Eo *eo_obj,
1225 Evas_Textgrid_Data *o, 1225 Evas_Textgrid_Data *o,
1226 const char *font_name, 1226 const char *font_name,
1227 Evas_Font_Size font_size) 1227 Evas_Font_Size font_size)
@@ -1258,7 +1258,7 @@ _evas_textgrid_efl_text_properties_font_set(Eo *eo_obj,
1258} 1258}
1259 1259
1260EOLIAN static void 1260EOLIAN static void
1261_evas_textgrid_efl_text_properties_font_get(Eo *eo_obj EINA_UNUSED, Evas_Textgrid_Data *o, const char **font_name, Evas_Font_Size *font_size) 1261_evas_textgrid_efl_text_font_font_get(Eo *eo_obj EINA_UNUSED, Evas_Textgrid_Data *o, const char **font_name, Evas_Font_Size *font_size)
1262{ 1262{
1263 if (font_name) *font_name = o->cur.font_name; 1263 if (font_name) *font_name = o->cur.font_name;
1264 if (font_size) *font_size = o->cur.font_size; 1264 if (font_size) *font_size = o->cur.font_size;
@@ -1471,11 +1471,11 @@ _evas_textgrid_efl_object_dbg_info_get(Eo *eo_obj, Evas_Textgrid_Data *o EINA_UN
1471 1471
1472 const char *text; 1472 const char *text;
1473 int size; 1473 int size;
1474 efl_text_properties_font_get(eo_obj, &text, &size); 1474 efl_text_font_get(eo_obj, &text, &size);
1475 EFL_DBG_INFO_APPEND(group, "Font", EINA_VALUE_TYPE_STRING, text); 1475 EFL_DBG_INFO_APPEND(group, "Font", EINA_VALUE_TYPE_STRING, text);
1476 EFL_DBG_INFO_APPEND(group, "Text size", EINA_VALUE_TYPE_INT, size); 1476 EFL_DBG_INFO_APPEND(group, "Text size", EINA_VALUE_TYPE_INT, size);
1477 1477
1478 text = efl_text_properties_font_source_get(eo_obj); 1478 text = efl_text_font_source_get(eo_obj);
1479 EFL_DBG_INFO_APPEND(group, "Font source", EINA_VALUE_TYPE_STRING, text); 1479 EFL_DBG_INFO_APPEND(group, "Font source", EINA_VALUE_TYPE_STRING, text);
1480 1480
1481 { 1481 {
@@ -1490,27 +1490,27 @@ _evas_textgrid_efl_object_dbg_info_get(Eo *eo_obj, Evas_Textgrid_Data *o EINA_UN
1490EAPI void 1490EAPI void
1491evas_object_textgrid_font_source_set(Eo *obj, const char *font_source) 1491evas_object_textgrid_font_source_set(Eo *obj, const char *font_source)
1492{ 1492{
1493 efl_text_properties_font_source_set((Eo *) obj, font_source); 1493 efl_text_font_source_set((Eo *) obj, font_source);
1494} 1494}
1495 1495
1496EAPI const char * 1496EAPI const char *
1497evas_object_textgrid_font_source_get(const Eo *obj) 1497evas_object_textgrid_font_source_get(const Eo *obj)
1498{ 1498{
1499 const char *font_source = NULL; 1499 const char *font_source = NULL;
1500 font_source = efl_text_properties_font_source_get((Eo *) obj); 1500 font_source = efl_text_font_source_get((Eo *) obj);
1501 return font_source; 1501 return font_source;
1502} 1502}
1503 1503
1504EAPI void 1504EAPI void
1505evas_object_textgrid_font_set(Eo *obj, const char *font_name, Evas_Font_Size font_size) 1505evas_object_textgrid_font_set(Eo *obj, const char *font_name, Evas_Font_Size font_size)
1506{ 1506{
1507 efl_text_properties_font_set((Eo *) obj, font_name, font_size); 1507 efl_text_font_set((Eo *) obj, font_name, font_size);
1508} 1508}
1509 1509
1510EAPI void 1510EAPI void
1511evas_object_textgrid_font_get(const Eo *obj, const char **font_name, Evas_Font_Size *font_size) 1511evas_object_textgrid_font_get(const Eo *obj, const char **font_name, Evas_Font_Size *font_size)
1512{ 1512{
1513 efl_text_properties_font_get((Eo *) obj, font_name, font_size); 1513 efl_text_font_get((Eo *) obj, font_name, font_size);
1514} 1514}
1515 1515
1516EOLIAN static void 1516EOLIAN static void
diff --git a/src/lib/evas/canvas/evas_text.eo b/src/lib/evas/canvas/evas_text.eo
index 91e952da5a..b310c187d9 100644
--- a/src/lib/evas/canvas/evas_text.eo
+++ b/src/lib/evas/canvas/evas_text.eo
@@ -1,6 +1,6 @@
1type @extern Evas.Text_Style_Type : __undefined_type; [[External text style type]] 1type @extern Evas.Text_Style_Type : __undefined_type; [[External text style type]]
2 2
3class Evas.Text (Efl.Canvas.Object, Efl.Text, Efl.Text.Properties, 3class Evas.Text (Efl.Canvas.Object, Efl.Text,
4 Efl.Text.Font, Efl.Canvas.Filter.Internal, Efl.Ui.Base) 4 Efl.Text.Font, Efl.Canvas.Filter.Internal, Efl.Ui.Base)
5{ 5{
6 [[Evas text class]] 6 [[Evas text class]]
@@ -274,8 +274,8 @@ class Evas.Text (Efl.Canvas.Object, Efl.Text, Efl.Text.Properties,
274 Efl.Gfx.size { set; } 274 Efl.Gfx.size { set; }
275 Efl.Gfx.scale { set; } 275 Efl.Gfx.scale { set; }
276 Efl.Text.text { get; set; } 276 Efl.Text.text { get; set; }
277 Efl.Text.Properties.font { get; set; } 277 Efl.Text.Font.font { get; set; }
278 Efl.Text.Properties.font_source { get; set; } 278 Efl.Text.Font.font_source { get; set; }
279 Efl.Text.Font.font_bitmap_scalable { get; set; } 279 Efl.Text.Font.font_bitmap_scalable { get; set; }
280 Efl.Gfx.Filter.filter_program { set; } 280 Efl.Gfx.Filter.filter_program { set; }
281 Efl.Canvas.Filter.Internal.filter_dirty; 281 Efl.Canvas.Filter.Internal.filter_dirty;
diff --git a/src/lib/evas/canvas/evas_textgrid.eo b/src/lib/evas/canvas/evas_textgrid.eo
index 51b4583ea4..0543a6eb9c 100644
--- a/src/lib/evas/canvas/evas_textgrid.eo
+++ b/src/lib/evas/canvas/evas_textgrid.eo
@@ -20,7 +20,7 @@ enum Evas.Textgrid.Font_Style {
20/* XXX: Actual definition is in C. */ 20/* XXX: Actual definition is in C. */
21struct Evas.Textgrid.Cell; [[Evas textgrid cell data structure]] 21struct Evas.Textgrid.Cell; [[Evas textgrid cell data structure]]
22 22
23class Evas.Textgrid (Efl.Canvas.Object, Efl.Text.Properties, Efl.Text.Font, 23class Evas.Textgrid (Efl.Canvas.Object, Efl.Text.Font,
24 Efl.Ui.Base) 24 Efl.Ui.Base)
25{ 25{
26 [[Evas textgrid class]] 26 [[Evas textgrid class]]
@@ -75,7 +75,7 @@ class Evas.Textgrid (Efl.Canvas.Object, Efl.Text.Properties, Efl.Text.Font,
75 $width and $height can be $null. On error, they are 75 $width and $height can be $null. On error, they are
76 set to 0. 76 set to 0.
77 77
78 See also @Efl.Text.Properties.font.set and @.supported_font_styles.set 78 See also @Efl.Text.Font.font.set and @.supported_font_styles.set
79 79
80 @since 1.7]] 80 @since 1.7]]
81 } 81 }
@@ -199,8 +199,8 @@ class Evas.Textgrid (Efl.Canvas.Object, Efl.Text.Properties, Efl.Text.Font,
199 implements { 199 implements {
200 Efl.Object.constructor; 200 Efl.Object.constructor;
201 Efl.Object.destructor; 201 Efl.Object.destructor;
202 Efl.Text.Properties.font { get; set; } 202 Efl.Text.Font.font { get; set; }
203 Efl.Text.Properties.font_source { get; set; } 203 Efl.Text.Font.font_source { get; set; }
204 Efl.Text.Font.font_bitmap_scalable { get; set; } 204 Efl.Text.Font.font_bitmap_scalable { get; set; }
205 Efl.Gfx.scale { set; } 205 Efl.Gfx.scale { set; }
206 } 206 }